Merge branch 'MDL-59396_master-fix' of github.com:markn86/moodle
commit11f512ee06b6a8c7866b60f32f9aee9d23be9e9b
authorJake Dallimore <jake@moodle.com>
Thu, 6 Jul 2017 03:54:48 +0000 (6 11:54 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 6 Jul 2017 03:54:48 +0000 (6 11:54 +0800)
tree47a0b3d87eb42c4c11bdfd85dcb027ec647ac1cb
parent3a2304f99b62ee8ce4ce2e8f0eee15b805dfd27f
parent661750afc2eb67cae4f23e385f09c5b8a1810617
Merge branch 'MDL-59396_master-fix' of github.com:markn86/moodle