Merge branch 'MDL-62619' of git://github.com/stronk7/moodle
commit89db4cc26e576d1e46cf7d76aad06e2698439fc8
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Aug 2018 00:43:43 +0000 (10 08:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Aug 2018 00:43:43 +0000 (10 08:43 +0800)
tree661c5c15a8d9fc89e95a52c39d17a8462e708703
parentb76d8da4a664ef2498d1d31b4ee2f11066648a58
parentc9840c0144efaa9dd201fb3b1b3c3dae021858c1
Merge branch 'MDL-62619' of git://github.com/stronk7/moodle