Merge branch 'MDL-59866' of https://github.com/marcusboon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Dec 2017 05:46:07 +0000 (13:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Dec 2017 05:46:07 +0000 (13:46 +0800)
commit6d326b17d818b20c77a2f36813fda27268ca17b9
tree2332fbb421d2e5f8dbec931cda1e9859af3d6fbe
parent2f920d9be8bda921ad330e37ca9ce73c220e3a95
parentf8e2383bdd0239453a75c3632f8c82970b0a0163
Merge branch 'MDL-59866' of https://github.com/marcusboon/moodle