Merge branch 'MDL-64300' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Dec 2018 00:28:06 +0000 (08:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Dec 2018 00:28:06 +0000 (08:28 +0800)
commit0178ee5594bd871085113ba517c0c9c8abc14eca
treec1a04c8a0a1f22354d2b0f84054b3928e0d83e3a
parentfeee85a6c1239c25a7776c3d70f04683a7f2ef80
parentf47c8f3525adf6c75efaca99b97e07c6ece604a4
Merge branch 'MDL-64300' of git://github.com/stronk7/moodle