Merge branch 'wip-MDL-57055-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 17:17:28 +0000 (19:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 17:17:28 +0000 (19:17 +0200)
commitff340a0afa1cf31da8fe25601f0e7d5f8cd08cca
tree7d61f186114f6115f07ac03859f72369a83be8f2
parent62a38a4ece516625be008f7e433fd21a755749db
parente6ccfad2429160db26180fc8dfbc4c8cfd4f8b2a
Merge branch 'wip-MDL-57055-master' of git://github.com/abgreeve/moodle