Merge branch 'MDL-60435_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Jul 2018 11:37:12 +0000 (13:37 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Jul 2018 11:37:12 +0000 (13:37 +0200)
commitaf0671c218c3502575f8758edd665fa91f3bb278
tree1d4846a70073cde4846fb3b3abf1a1d2ddfbf0cd
parenta7870910ea574a6fbb33242cc21e401a2c9df86a
parentc61a4a9d21c65b49b8c997ae48f8599fb0df8b37
Merge branch 'MDL-60435_master' of git://github.com/markn86/moodle