Merge branch 'MDL-63119-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 10:36:08 +0000 (12:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 10:36:08 +0000 (12:36 +0200)
commit8199e69b47e0b441d03e23f00d06529d89cecfcc
treee72753b2f225ee2b3c00ea4438ae59db4c8b44d9
parentcebb7ba17c464c74310323f524491acf69b1c0b0
parentd2111dbccf4249697b390ae6fd5a4cf8e712aff0
Merge branch 'MDL-63119-master' of git://github.com/lameze/moodle