Merge branch 'MDL-60590_master-fix' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Nov 2017 03:59:49 +0000 (11:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Nov 2017 03:59:49 +0000 (11:59 +0800)
commit1ccc9f1953761aa08762869be311f5288c9e8873
tree4182108d1182154b80370905e350f8dcb509535f
parent8aa01fcf61a4ff493d10ad38391e36571fc5b781
parente3a6d448457adfc4a991330e14fc07c47e6b045b
Merge branch 'MDL-60590_master-fix' of git://github.com/markn86/moodle