Merge branch 'MDL-53808-master' of git://github.com/cescobedo/moodle
commit38036e73c22fe8fad5b3fb4144d8b5c025fdfbe4
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 03:34:59 +0000 (17 11:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 03:34:59 +0000 (17 11:34 +0800)
treedd281727fd27e31c4f70ff4fb62bbce985545a97
parent4a91bd6f62e61c913122c160a03113737efd42ff
parent437ffc9f46ad5744d9bc0413ae20eb6965878d61
Merge branch 'MDL-53808-master' of git://github.com/cescobedo/moodle