Merge branch 'MDL-60575-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 02:05:38 +0000 (10:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 02:05:38 +0000 (10:05 +0800)
1  2 
lang/en/admin.php

Simple merge