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)
1  2 
lang/en/admin.php
mod/forum/lang/en/forum.php

Simple merge
Simple merge