Merge branch 'MDL-57455_master-fix' of https://github.com/markn86/moodle
commitbc22db02fb21cd92f9fba861f724fa7faafff877
authorJake Dallimore <jake@moodle.com>
Wed, 18 Oct 2017 08:36:10 +0000 (18 16:36 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 18 Oct 2017 08:36:10 +0000 (18 16:36 +0800)
tree7cc5b726f7dcdcfa8ac58ed4fbe09a0d202beedc
parentffbe92bffbe72766f0964910cedfd38c1c4ab7b9
parent3dfd48ba9c078f27cc96b6b54e298b9ae1004a1c
Merge branch 'MDL-57455_master-fix' of https://github.com/markn86/moodle