Merge branch 'MDL-62234-master' of git://github.com/bmbrands/moodle
commitdcb2cea690718db61b0bf31d30bab93f2c6a948d
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 01:51:18 +0000 (18 09:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 01:51:18 +0000 (18 09:51 +0800)
treebf5095c095cea0eed3ecca6fc4545cf41d25c0d4
parentb885f0bf6018920a27f4ed9b09e02011b59b3672
parent1b2170251114c802d93b60656ee6cefb3d77db2a
Merge branch 'MDL-62234-master' of git://github.com/bmbrands/moodle