Merge branch 'MDL-36754-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 14 Aug 2018 08:18:55 +0000 (10:18 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 14 Aug 2018 08:18:55 +0000 (10:18 +0200)
commit8e6c2ce30020ea20c86b0cf01677d4fa3ae1efe6
tree21ffdde4741353308584d7f21c3c32a7f7a026a6
parent3ff9233a18120f9c6651f3cdfbfea3ff10565742
parent2e8d476165e2f5652f43354634682e9f25c31ed0
Merge branch 'MDL-36754-master' of git://github.com/andrewnicols/moodle