Merge branch 'MDL-60830-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 27 Nov 2017 02:29:55 +0000 (10:29 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 27 Nov 2017 02:29:55 +0000 (10:29 +0800)
commitd735cb5230ea4048449044a0ac26bd820724e824
tree3e80fb20553e391ad594aca0ac4f8039d8a244f4
parentd470de673c66b4cd490299559ef4f9ba52e09097
parent46ea440b87ab9417eff22d76e225152c4821c35c
Merge branch 'MDL-60830-master' of git://github.com/sarjona/moodle