Merge branch 'MDL-63165-master-fix' of https://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 29 Aug 2018 04:33:29 +0000 (12:33 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 29 Aug 2018 04:33:29 +0000 (12:33 +0800)
commit9e854122472b5f66f6617a748a916af395e2fe6a
tree16dc7ae9f874cad11e4b3c6d840f9eeeb8ac019e
parent8981ac01974bae4f59a7de47c6198675f14b2821
parentdab0f9aae7f3d357f90724fbe233852256e6d304
Merge branch 'MDL-63165-master-fix' of https://github.com/andrewnicols/moodle