Merge branch 'MDL-60373-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 16:28:47 +0000 (18:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 16:28:47 +0000 (18:28 +0200)
commit7f1f78d23ec85d5144cff847115eb29f185940a4
tree97ce67b117551ad464b19d89fa4604475d251e68
parent5d5ebedf565f379149061fb104906710ae7d1ddb
parentbf02f2e91c6d867e357a4263ab7a0a485ce9b948
Merge branch 'MDL-60373-master' of git://github.com/andrewnicols/moodle