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