Merge branch 'MDL-59366-master-fix-2' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Aug 2017 01:56:22 +0000 (09:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Aug 2017 01:56:22 +0000 (09:56 +0800)
commit10b788ffa63c7de280e9fa5008a74b6eea2e31c9
treef3ccc4ce5ccda616d4487904638627ea4947ce00
parentb32b78cc0cf34ff9a8ef381fa5965a38047885d5
parent1453d146b3134c9102909db2db67e4623030a98f
Merge branch 'MDL-59366-master-fix-2' of git://github.com/junpataleta/moodle