Merge branch 'MDL-54742-master-integration' of https://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Jul 2018 02:34:15 +0000 (10:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Jul 2018 02:34:15 +0000 (10:34 +0800)
commit739b7bcf9f554d32bc55055b752c885cd3b7273d
treed7eff0579d9389a9e8d7f495b89e7070b39852e8
parente270bf92a1f49bb36183d36f2c82d9fb53ffc3dd
parent8ba04d45655f54e99a0d1f5737c038f7784bc77e
Merge branch 'MDL-54742-master-integration' of https://github.com/mihailges/moodle