Merge branch 'wip-MDL-59992-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Sep 2017 10:23:22 +0000 (11:23 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:13 +0000 (10:50 +0200)
commitc1346b14766a5adf266fd8f8018ce55acf4a19ee
treea2fea55ee8cb4dd2dcc3a824d6767e71182231eb
parentc4f7a1c001722697244d8a13924c9c62a7315135
parente25ccd58c1d82009070cda3620165430919b52b2
Merge branch 'wip-MDL-59992-master' of git://github.com/marinaglancy/moodle