Merge branch 'MDL-65537-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2019 18:07:50 +0000 (20:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2019 18:07:50 +0000 (20:07 +0200)
1  2 
lang/en/badges.php
mod/forum/lang/en/forum.php

Simple merge
Simple merge