Merge branch 'MDL-53356-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Mar 2016 07:56:13 +0000 (15:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Mar 2016 07:56:13 +0000 (15:56 +0800)
commitdd39020d6887753aae1863825a566ec4b5204c7b
treeaab9a4d68fe02cb044bac057c8d5e5953d54debe
parenta6970233503efa168ad269f3e34db45afa62370a
parent2c8c24412e03077126cb9569854dc3d10bfd5c1f
Merge branch 'MDL-53356-master' of git://github.com/cameron1729/moodle
admin/settings.php