Merge branch 'MDL-61423-master' of git://github.com/mihailges/moodle
commit1e9016d8d85a9cbfc4802ccc55d14c983ddd0d17
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Mar 2018 07:26:30 +0000 (8 15:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Mar 2018 07:26:30 +0000 (8 15:26 +0800)
tree5047a129b06fea9a0fca1f7aaf1ced92a72f6d23
parent438a62f28bc2179e3bc4b2b865cfec914f9bbb2b
parent25dbbdf90bb1f5fb49a6a7a63f30be297a754a1d
Merge branch 'MDL-61423-master' of git://github.com/mihailges/moodle
lang/en/admin.php
lang/en/moodle.php
version.php