Merge branch 'MDL-61948-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 03:38:04 +0000 (11:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 03:38:04 +0000 (11:38 +0800)
commit25d9974ac6e091008765cfb1de8d17d86f7c7f5e
treef3bda9555c5c1b77aa606c65649be7a54463453e
parent305f4f69ebb3f84ab7f7aa7ab3024575a3151834
parentf143179a66dafc3a7ef95b3c68b55541c6aa2f48
Merge branch 'MDL-61948-master' of git://github.com/mihailges/moodle