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