Merge branch 'MDL-61484-master' of git://github.com/junpataleta/moodle
commit009ab166898bd9107505f5d3f9eaf337aab26335
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jun 2018 08:33:52 +0000 (11 10:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jun 2018 08:33:52 +0000 (11 10:33 +0200)
treeb5a14c0d0f2f948ee82cae2c8a349e575b72e334
parent15b3d284f3e9c4d2fb8d5adc168832187d83357e
parent64818f403de87c74859e6350593f5b1f12804fb5
Merge branch 'MDL-61484-master' of git://github.com/junpataleta/moodle