Merge branch 'MDL-60306-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 02:15:07 +0000 (10:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 02:15:07 +0000 (10:15 +0800)
commite38183450f281dfe6a541f3bedb46b859a8b5fb8
tree41639ec76efa4af9cc065ba7efc6d20a7e31d128
parent23ab0d7788d5955d906abea50485ed5bb6c0ba11
parent2340579586cf5952dab9295978f3d5f4c36de811
Merge branch 'MDL-60306-master' of git://github.com/junpataleta/moodle