Merge branch 'MDL-62144-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:33:17 +0000 (16:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:33:17 +0000 (16:33 +0200)
commit7e5f0fa66a409f722e549f478c4ca953298651c3
tree1d2bd9464a2db083ebb8e41f092658aa3d59e75f
parent14f70eda2872b7095d606fd77eaba1c1c72dc96a
parenta986cb4ba143570f6402abfb3b1757c2c32cae45
Merge branch 'MDL-62144-master' of git://github.com/damyon/moodle