Merge branch 'MDL-63711-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Nov 2018 06:20:24 +0000 (14:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Nov 2018 14:48:30 +0000 (15:48 +0100)
commit6d47156f75c5ac5fc2cc3ab0d4cb147c859cb925
tree6b6ea8a26ec239ffee6808c12ed5710f9e0212a0
parent5c145757a8a56ad4bce3090ef6de3d6ecb6320eb
parentad2737c9c905ceb5ac3200b5e337e2636d4970c5
Merge branch 'MDL-63711-master-fix' of git://github.com/junpataleta/moodle