Merge branch 'wip-MDL-61814-master-fix' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 May 2018 02:48:47 +0000 (10:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 May 2018 02:48:47 +0000 (10:48 +0800)
commit61b1cc4dd7591ccedd904867536fc0221117ac0d
treed51fb13cf91c9f8e6c9eff2cb01c7985afa9991e
parentb3252ecdc147aa8d302d25a7fe19212c9e96701f
parent28f3776451a4fdd6804ff39532b0dc0947d3b5a2
Merge branch 'wip-MDL-61814-master-fix' of git://github.com/abgreeve/moodle