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)
1  2 
admin/index.php
lang/en/admin.php

diff --cc admin/index.php
Simple merge
Simple merge