Merge branch 'MDL-60234-master' of https://github.com/abias/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Oct 2017 05:10:17 +0000 (13:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Oct 2017 05:10:17 +0000 (13:10 +0800)
commit086d592d4319b8def68eb106a79e9b3522df6e05
treece9057d50161bb164b72eac7bb36b1c2326a5e92
parent8905d3efe057e5103ec81ddae65cd3a46949781b
parentf3807433035e3b18ef794add37093364984e51f5
Merge branch 'MDL-60234-master' of https://github.com/abias/moodle
admin/index.php
lang/en/admin.php