Merge branch 'MDL-60960-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 11:10:20 +0000 (12:10 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 11:10:20 +0000 (12:10 +0100)
commit2692af90323f717b164739fab55c20412538491e
tree7e5b35953331edcfe6241fa17c9b8c6129f7eb0c
parentc1dd6af98adb7493784f7318562cf26d0709918c
parent9aeb909d2fc47644754a3f6893b8c10501836831
Merge branch 'MDL-60960-master' of git://github.com/ryanwyllie/moodle