Merge branch 'MDL-63682-master' of git://github.com/mihailges/moodle
commit6f635314582eec6f68b7c8126fa22f9bad453ec1
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 03:01:28 +0000 (26 11:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 03:01:28 +0000 (26 11:01 +0800)
treeab2c1e7251139ae6c6ba58c22f8884be256236fc
parentab2443cdc036ae69109e0474c8a6f0bbd2648fa5
parentbdf1b47550c817bfaafadc3034eb7f27e9d74b6d
Merge branch 'MDL-63682-master' of git://github.com/mihailges/moodle