Merge branch 'MDL-42366-master' of https://github.com/lucisgit/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 11:17:07 +0000 (13:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 11:17:07 +0000 (13:17 +0200)
commitb321d231ffa123c1511c92fa92c71f1ebf449f3e
treedc12e39f1902284344364a9f43a88a680975eb06
parent5b4ca9eb5b12f3df982219504f3f1cef813c0a1d
parent166ac972c3969c212a9ebadf72d5235157a9d628
Merge branch 'MDL-42366-master' of https://github.com/lucisgit/moodle