Merge branch 'wip-MDL-60543-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Oct 2017 06:19:43 +0000 (14:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Oct 2017 06:19:43 +0000 (14:19 +0800)
1  2 
lang/en/admin.php

Simple merge