Merge branch 'MDL-61253-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 29 Jan 2018 05:32:22 +0000 (13:32 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:15 +0000 (10:33 +0800)
commit915140bced1d584590a99f577d62e403b0149018
tree7156240206204dfbee14d73945714c22dceb2c6a
parent8be8fb9a2e0ffd8913a2c9d4d616143ede49d803
parent51d31432c875644abfcaee8f9fe2e32e9481ab0c
Merge branch 'MDL-61253-master' of git://github.com/andrewnicols/moodle