Merge branch 'MDL-62364_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 10:29:17 +0000 (12:29 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:59 +0000 (09:15 +0800)
commita49a43853672b729ca1c9baa1e9a763f12b33172
treeaafe4f40dc4042913c746d09485294f18a00b4f4
parent6fe7510ae0f7e13c4fe9c387d5103a21ae575e0a
parentb6b7c2636f20ac0cc5809b6263f1cb852ad2b57e
Merge branch 'MDL-62364_master' of git://github.com/markn86/moodle