Merge branch 'MDL-63002_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Jul 2018 14:15:16 +0000 (16:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Jul 2018 14:15:16 +0000 (16:15 +0200)
commite32fe4339add92de87a9ec6a8b79819f4ffd54fb
treea769fc3064990c2396a5c085d3db769408f413b3
parentaf0671c218c3502575f8758edd665fa91f3bb278
parent8bfe908209e09fb20e0b5cb201b2cd653fa8867e
Merge branch 'MDL-63002_master' of git://github.com/markn86/moodle