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)
commit06cab841769727f5622602211771dd62da995aa0
tree47c3c9d46aee00793d84358da3751915c8672a7c
parent1891ed7bb096b66d9d5f7e65b638517f0fdc6c9f
parentd498287fd7cdd43988b7ffedb421c9cd0e25138b
Merge branch 'MDL-62167-master' of git://github.com/FMCorz/moodle
lang/en/badges.php