Merge branch 'MDL-63421' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Oct 2018 00:49:34 +0000 (08:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Oct 2018 00:49:34 +0000 (08:49 +0800)
1  2 
lang/en/admin.php

Simple merge