Merge branch 'MDL-45851' of git://github.com/timhunt/moodle
commitbfeef10af0808322182f69fef661e4bb90ecd833
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Jul 2018 05:10:24 +0000 (16 13:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Jul 2018 05:10:24 +0000 (16 13:10 +0800)
treedcbe79b9e43247e387ddeef19bf42248cb63a3b0
parentc6150f1104572cd72c3bba392b3bb38483adc38e
parent3511063252ab114a2343cc246aa1a66639a27979
Merge branch 'MDL-45851' of git://github.com/timhunt/moodle