Merge branch 'MDL-33886-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Dec 2017 09:29:47 +0000 (10:29 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:55 +0000 (17:54 +0100)
commitc1d685b500b24439a21f794edf8c67df560023d8
treeb0555edfef163ae5bdd7dc7cd14d6ba0e85e16e5
parent1b374b4f2cce32518cfb4860b05f66b368e8a4ae
parent85ba9528c91e199f51e8e7991dc71f8f8824caa4
Merge branch 'MDL-33886-master' of git://github.com/zig-moodle/moodle