Merge branch 'MDL-63117-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 14:32:58 +0000 (16:32 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 14:32:58 +0000 (16:32 +0200)
commit6302d4cf64a60c457a2584494a7f298432ff72ee
tree1840a932c932ce3782a487e30f7ab9bd31a5fa91
parent0e5144fe24b2f47d668c90a3f0c6c0d4748b01c1
parentdd1ba60f30f3264f344f34fe588365d32c823a3c
Merge branch 'MDL-63117-master' of git://github.com/rezaies/moodle