Merge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 Nov 2017 07:46:44 +0000 (15:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 Nov 2017 07:46:44 +0000 (15:46 +0800)
commitb6319f70bd72f18dbe1455d733f4bd0dac9553dd
tree5f86f91f4ad506f2e4e77fc6b2eff71e2eb8c3bb
parentc9f995872f523864cb4bcaa6c4d047379ddb402b
parente759c9ed837146e07bbd3a53a855861f1218b4b7
Merge branch 'MDL-60590-master' of git://github.com/andrewnicols/moodle