Merge branch 'MDL-59630_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Oct 2017 06:56:57 +0000 (14:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Oct 2017 06:56:57 +0000 (14:56 +0800)
1  2 
lang/en/admin.php

Simple merge