Merge branch 'MDL-66481-master-6' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 26 Sep 2019 03:57:51 +0000 (11:57 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 26 Sep 2019 03:57:51 +0000 (11:57 +0800)
1  2 
mod/forum/lang/en/forum.php
mod/forum/lib.php

Simple merge
Simple merge