Merge branch 'MDL-61693-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:24:02 +0000 (10:24 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:24:02 +0000 (10:24 +0200)
commit3128529784bed259a954ff0afeed31dc74811e74
tree9128fd0831a9c6e0172a2c42f41cc78d3183afb4
parent4e7232b82e3c1eacc72130c211bc28f2e3792981
parent49d6fb0379c26efa7f6ed1bf991bfce3b4d22f37
Merge branch 'MDL-61693-master' of git://github.com/zig-moodle/moodle