Merge branch 'MDL-62588-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 10:52:15 +0000 (12:52 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 10:52:15 +0000 (12:52 +0200)
commitfa6f911fc5be0327fc91bcd7b4df56e24328fa8c
tree89c0db48f4ee59abcad58cc470208b4178f02fea
parentc85a3823b8dbddc37964e8e5626269da8e343ffc
parentf84df305c0c04b1ae74c9b0493d1c8959137826a
Merge branch 'MDL-62588-master' of git://github.com/rezaies/moodle