Merge branch 'MDL-60914_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 3 Dec 2017 23:50:06 +0000 (12:50 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 3 Dec 2017 23:50:06 +0000 (12:50 +1300)
commitc1cd2924ec742d280a1f38ccdd665e7860dc5a93
treed5ff9b8ea7a70d1ae34a10efba7f275fc86606a0
parent5f54a8760f2821c12bd90beaa37b9fa937f101e6
parent2a56a82c9ba80579cf7fdb13e7a16f4eabd3fe7d
Merge branch 'MDL-60914_master' of git://github.com/markn86/moodle