Merge branch 'MDL-60667_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Nov 2017 05:27:11 +0000 (13:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Nov 2017 05:27:11 +0000 (13:27 +0800)
commit3602df58b21e6796afea19be84437f34891f803f
tree00491115a059e3cc5ee4db6abb0f82d3efad3ec9
parentf3743b3041b663b4f1c488174086d10cbe4f3d07
parent20b2565c38deeddd5bc5bd3df5866d58f19d9339
Merge branch 'MDL-60667_master' of git://github.com/dmonllao/moodle