Merge branch 'MDL-67527-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 29 Dec 2019 22:26:52 +0000 (23:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 29 Dec 2019 22:26:52 +0000 (23:26 +0100)
commita0ba8feef6e5d97da26e55b8511eee38f2075ba4
treea019244aef9f431db94dc8a906bd583d18b0a82b
parentb970666610281efa5c27daf1e9b31df104626de5
parent6aff025cad8c6c38d8aed5b31a711059891fafc1
Merge branch 'MDL-67527-master-enfix' of git://github.com/mudrd8mz/moodle
lang/en/admin.php
mod/forum/lang/en/forum.php