Merge branch 'MDL-62807-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Jul 2018 05:48:15 +0000 (13:48 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Jul 2018 05:48:15 +0000 (13:48 +0800)
commita77beeb245593cd61581e3376f84a2cbf6bfe139
tree948f631a0dfabe45fc92d6269ea2d208acf5c56e
parent59d072a81ad18a8735bc9fedad0915d513cf34b1
parent6a621b0ce73bd4b6e3a71e549b9b1b26856b999c
Merge branch 'MDL-62807-master' of git://github.com/damyon/moodle