Merge branch 'MDL-60826-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 05:40:25 +0000 (13:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 05:40:25 +0000 (13:40 +0800)
commit59d072a81ad18a8735bc9fedad0915d513cf34b1
treee8d5cb59da44b411cff1a5eed5a202d79003bfec
parentdc45b688b39fce05c7b738b1101f69f5b6a6740f
parentf8a95c3df696bfc54f994ef56fb1b9ae35276ded
Merge branch 'MDL-60826-master-fix' of https://github.com/lameze/moodle