Merge branch 'MDL-60700-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 8 Nov 2017 02:17:25 +0000 (15:17 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 8 Nov 2017 02:17:25 +0000 (15:17 +1300)
commitc9f995872f523864cb4bcaa6c4d047379ddb402b
treeaf2e6a2ca11312e7b20ba5e058d04e126475903c
parent7a2300fd8240c9496c52dcb5757edf0249c9ceec
parent2e36c426253512f00e495369d9d65b2c05661591
Merge branch 'MDL-60700-master-fix' of git://github.com/andrewnicols/moodle