Merge branch 'wip-MDL-37757-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Dec 2017 01:18:25 +0000 (09:18 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:29 +0000 (19:53 +1300)
commitebe2fafa8b3974412d145ec250a69e08bb90c6bb
treed0d6f0d9f8625b7499c775ce42bb6e6ec0f70399
parent713a2cbb250055fd6e0186958ed572eaac045375
parent33e385a5fb224c30055068f780bec8bde5afa9d0
Merge branch 'wip-MDL-37757-master' of git://github.com/abgreeve/moodle