Merge branch 'MDL-63346' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Sep 2018 00:35:08 +0000 (08:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Sep 2018 00:35:08 +0000 (08:35 +0800)
commit1a9fc39277d56ca5aebd5d8c0131fbea446bb5a1
tree9294c1e9f7ecf50f69d6b924a38360e70ea7b0e2
parent0de29dbf35198e55493efa8d0417bca4a3403f56
parentef10e7db4cbad1f433df1aa0f8fdb1c9ed3e724d
Merge branch 'MDL-63346' of https://github.com/stronk7/moodle