Merge branch 'MDL-65475-master-1' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 3 May 2019 06:26:40 +0000 (14:26 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 3 May 2019 06:26:40 +0000 (14:26 +0800)
1  2 
mod/forum/lang/en/forum.php

Simple merge