Merge branch 'MDL-60819-master' of https://github.com/snake/moodle
commit6f38bb9bdcb191a7dcdedd07d7e416335b603a3e
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jun 2018 00:58:49 +0000 (12 08:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jun 2018 00:58:49 +0000 (12 08:58 +0800)
treef013d5281b0c0ba76a9f05799ebb78b5542bf9b2
parente692de3e58c42f677c3e5f1b763b7f724a9adea8
parent28c3f6e4d8bc016762f7f69eafe246315d57834b
Merge branch 'MDL-60819-master' of https://github.com/snake/moodle