Merge branch 'MDL-62516-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 May 2018 09:15:02 +0000 (11:15 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 May 2018 09:15:02 +0000 (11:15 +0200)
commit30f61e4d3028bcb1f0595121209a67f24f84a353
tree954850e1644e356d768a4016f67c81885049b52b
parent5c334275df6851e919ff7aced600ba0025881e25
parent630081dd9145c3950dcbb2bf2bf4137ddf2095d3
Merge branch 'MDL-62516-master' of git://github.com/andrewnicols/moodle