Merge branch 'MDL-65017-master' of git://github.com/jleyva/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 24 Oct 2019 05:53:01 +0000 (13:53 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 24 Oct 2019 05:53:01 +0000 (13:53 +0800)
1  2 
mod/forum/lang/en/forum.php

Simple merge