Merge branch 'MDL-59206-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 03:35:26 +0000 (11:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 03:35:26 +0000 (11:35 +0800)
1  2 
lang/en/moodle.php

Simple merge