Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 23 Oct 2017 06:28:51 +0000 (14:28 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 23 Oct 2017 06:28:51 +0000 (14:28 +0800)
commitab94608ffbad8f9d310e6d6ac06ffbbd153e0993
tree050abc755aea37c046c914e770ff1a65230f55ee
parent2f5284f5fba657da45d1ef769099b4530d5d0e87
parent345f23c9844d1adb392c9394bcab45db5bdc598d
Merge branch 'MDL-60537-master' of git://github.com/andrewnicols/moodle