Merge branch 'MDL-63297' of https://github.com/timhunt/moodle
commitd769d7c2dbc1848c47737766198a9e2b2230c0eb
authorDamyon Wiese <damyon@moodle.com>
Tue, 6 Nov 2018 03:39:09 +0000 (6 11:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Nov 2018 14:45:23 +0000 (6 15:45 +0100)
tree3780dbb5bc5204094d0ca39d1d3bf8ef67ab90b1
parenteea49debc8f77f1cef7ec2831ad0f9ab85813953
parentebf91776d7a9eb2d8a08ad879fb5030a207b4797
Merge branch 'MDL-63297' of https://github.com/timhunt/moodle