Merge branch 'MDL-63640-master' of git://github.com/mihailges/moodle
commit2612cf5673e509ff4a095167519ee0b9ae3244b6
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 03:25:21 +0000 (23 11:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 03:25:21 +0000 (23 11:25 +0800)
tree65140c3c1708a6cf08677da4de2755a88ffbf4e3
parente1cc780d909b9741e84603e8dfb4f8804cb07f79
parent16ec426a4f0871092db86c89cbac55086bc8554a
Merge branch 'MDL-63640-master' of git://github.com/mihailges/moodle