Merge branch 'MDL-60339-master' of git://github.com/Chocolate-lightning/moodle
commit025cf94cfea9fc63d4815b715b8b9021e88cc70d
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 25 Mar 2019 03:09:54 +0000 (25 11:09 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 25 Mar 2019 03:09:54 +0000 (25 11:09 +0800)
treef6748cb51da6e4e0a055db83908cf371dfe303c4
parentbf1537b60094d5ed76007c3c6bf9aac2171765e9
parent3828422d82941caaf5be673dcd6283595e32406b
Merge branch 'MDL-60339-master' of git://github.com/Chocolate-lightning/moodle