Merge branch 'wip-MDL-61308-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 01:15:25 +0000 (09:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 Apr 2018 01:15:25 +0000 (09:15 +0800)
commit1c42b1d6ed036550b2786a4328379dc272e1e143
treeabde998557f28843c72e9a23dbb52367b5901846
parentaf099b484cf6271cb91c7149b57851772c4c16c3
parentf8650bb7a3d1a4fbafa0b6e832813bd753527809
Merge branch 'wip-MDL-61308-master' of git://github.com/abgreeve/moodle