Merge branch 'MDL-62167-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:10:31 +0000 (11:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:10:31 +0000 (11:10 +0800)
1  2 
lang/en/badges.php

Simple merge