Merge branch 'MDL-61707-master' of git://github.com/mihailges/moodle
commit653c30708dbff7845ad7354a38a2cd838af47c13
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 03:33:20 +0000 (23 11:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 03:33:20 +0000 (23 11:33 +0800)
tree003293d31826c422eb8d62219575f68937306da2
parent311199f52e9f7b0fb129a7b0d747fb4bebf45c62
parent204178d646f6cf59183a3b25af6ab29a2eb13134
Merge branch 'MDL-61707-master' of git://github.com/mihailges/moodle