Merge branch 'MDL-61986-master' of git://github.com/FMCorz/moodle
commit0d1707f05386611d1596b981dd8cd3ee8d533a0b
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 14:26:03 +0000 (25 16:26 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Apr 2018 14:26:03 +0000 (25 16:26 +0200)
tree896b38e50cf874f00c831509e84d6a8d7c8d3328
parent641d113c881f9abba01b5179f6a7a1b8655df8f7
parent83ef2b2cf86f2aa0e5115309ca0002a14b7ecb80
Merge branch 'MDL-61986-master' of git://github.com/FMCorz/moodle