Merge branch 'MDL-61378-master' of git://github.com/damyon/moodle
commite2f8547acf62aa1c395d1082b1d68546a7577e18
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Oct 2018 06:57:49 +0000 (9 08:57 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Oct 2018 06:57:49 +0000 (9 08:57 +0200)
tree5c4071535bd47e533766cea78cefa102c170c5b0
parent14719185b042d98b426dff5666bc4b9747cb780e
parent2015327b2837bbc8b1f1b3ac98ad38f34dec4796
Merge branch 'MDL-61378-master' of git://github.com/damyon/moodle