Merge branch 'MDL-45389-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 16 Jul 2018 02:11:40 +0000 (10:11 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 16 Jul 2018 02:11:40 +0000 (10:11 +0800)
commitc6150f1104572cd72c3bba392b3bb38483adc38e
tree0896d284486e83a8f33d8bb85761725389afb728
parent8c5162684144853a8ee3abd0862489e88421ab83
parent5cb24d229989683fd6e6636e1569609f938f7c36
Merge branch 'MDL-45389-master' of https://github.com/lucaboesch/moodle