Merge branch 'MDL-63012-master' of https://github.com/jobyh/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 01:32:55 +0000 (09:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Aug 2018 01:32:55 +0000 (09:32 +0800)
commit19d5c416e02bb8e52855b6979392014cd96bc79b
tree6e6e282bc9da7012f61cc47ef1f49dfda908b03c
parent2a8830379f4c756082307cfaee29ccda3acd20fd
parentfbd1877f204cfc74e3f09373e3ad5b99e294fef6
Merge branch 'MDL-63012-master' of https://github.com/jobyh/moodle