Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 14:56:25 +0000 (15:56 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 14:56:25 +0000 (15:56 +0100)
commit29adfbc3c80a774772bf4d91eee988c0d4c9e675
treeada5611a790dfce81451bcd2b188550cda74159c
parent4e73acf3cf583bb9f4a51b52e6018d3cd0ef4a55
parent65c52e05d109f111f91dacfbe6ed00e8fa4bc234
Merge branch 'MDL-58699-master' of git://github.com/damyon/moodle