Merge branch 'MDL-41463-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 04:59:00 +0000 (12:59 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 04:59:00 +0000 (12:59 +0800)
commita2e64810d4dfcec87551c0f66d0eb082cb03c19c
treeeb5e252778c3c677ae809a21192d827bd1aa1aee
parentbbaab1bae77704afd103342580b47e47a1bbec31
parent4f2e193eb65b358c2b0a9ad441a7ccf57e3ec8d6
Merge branch 'MDL-41463-master' of https://github.com/lucaboesch/moodle