Merge branch 'MDL-61761-master' of git://github.com/mihailges/moodle
commit1c217fa9eeec0be931eadaefe874244623078bd6
authorJake Dallimore <jake@moodle.com>
Thu, 5 Apr 2018 05:17:53 +0000 (5 13:17 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 5 Apr 2018 05:17:53 +0000 (5 13:17 +0800)
tree0d1873c733366283850b657ab431814b728c0719
parent90cdf50dd92f7248212a2074af950926f0a084c0
parent0edc94e31603cdf2f6cf40a0a9053bfe2932e089
Merge branch 'MDL-61761-master' of git://github.com/mihailges/moodle