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)
commit5266994547ac4d3c4ab5c817dc19ac8de7061ed3
tree6fcc796cc166e215f61e81637c7cd8be22185679
parent4c8569e0bfee029e6c1fd17e51efd565121978a4
parent8a95de6bccd5e3ce1cd97134a63dabdf33c65960
Merge branch 'MDL-63421' of git://github.com/stronk7/moodle
lang/en/admin.php