Merge branch 'MDL-61957-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 04:39:34 +0000 (12:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 04:39:34 +0000 (12:39 +0800)
commitffced67c6708f74d43238469568cd712694e8fc6
treebd89ac54c181668b0026303aa41447d03b690b8a
parent1e351f0976399e6e5e42ec02a041d784dad14137
parentc01040214a78830744a666f77270ed3ef4aec4bc
Merge branch 'MDL-61957-master' of git://github.com/sarjona/moodle