Merge branch 'MDL-63530-master-2' of git://github.com/mihailges/moodle
commit244c0e10f93d74e690b646e9679c432389ca80e8
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 01:02:08 +0000 (31 09:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 01:02:08 +0000 (31 09:02 +0800)
treecb471d9b459cd3afb2de6a893a5d544d4d13e796
parent4b7418d3b0409bf68fa56e0a75a445fd87289e56
parentfd45ae45665a94d9c86b41e378a85189278a5fec
Merge branch 'MDL-63530-master-2' of git://github.com/mihailges/moodle