Merge branch 'MDL-64821-master-2' of https://github.com/ryanwyllie/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 26 Sep 2019 02:45:44 +0000 (10:45 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 26 Sep 2019 02:45:44 +0000 (10:45 +0800)
1  2 
mod/forum/lang/en/forum.php
mod/forum/lib.php
theme/boost/style/moodle.css
theme/classic/style/moodle.css

Simple merge
Simple merge
Simple merge
Simple merge