Merge branch 'MDL-60801' of https://github.com/andrewhancox/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Dec 2017 04:48:52 +0000 (12:48 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:32 +0000 (19:53 +1300)
commitadbe17ec68f807fffb9c6d287bb09fa5f24cc70b
treedf6fcdfbedc7406e735c2173961427cf68fcfd9a
parent9501b1eb7634fe67433e5a3d0fee77e079453b3e
parent1744570b2e7cb7cfdc539aa141f386a3ad41ce84
Merge branch 'MDL-60801' of https://github.com/andrewhancox/moodle