Merge branch 'MDL-63431-master' of https://github.com/kabalin/moodle
commit7ba798c01d51d7da0c779f3400533a933a4ade11
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Oct 2018 07:13:53 +0000 (15 09:13 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Oct 2018 07:13:53 +0000 (15 09:13 +0200)
tree1d7eccf7b0a9abaa5aeceffd2089466b0a62c98c
parent2debe416c65699638904e12968f92f2af91901dd
parent0030362e4c260351a51e362f0fc0daa03411b5b0
Merge branch 'MDL-63431-master' of https://github.com/kabalin/moodle