Merge branch 'MDL-58702-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 09:53:21 +0000 (11:53 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 09:53:21 +0000 (11:53 +0200)
commitfca5c2de0528a2f83a29183fc5c92f463618182a
tree013b90d65ac969452190c102751de1409eb947aa
parent67196d5080961c878fd53dfc861c283fd969e5cd
parente689e4d446013bdbf96530ab3b17ac9dae3cc87b
Merge branch 'MDL-58702-master' of git://github.com/zig-moodle/moodle