Merge branch 'MDL-47962' of git://github.com/timhunt/moodle
commitccff34bf07517fa672a6853a5cbd7b9ef36dbd28
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Sep 2018 07:45:47 +0000 (24 09:45 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Sep 2018 07:45:47 +0000 (24 09:45 +0200)
tree524bfe3304c0a87dac3b6b81ee826168c0c9e19b
parentbdc511364cc6d3b1cb75f84a28baf99f6ffe1962
parent3923151a1af57d3a16771a422a89a37489a95ac1
Merge branch 'MDL-47962' of git://github.com/timhunt/moodle