Merge branch 'MDL-37669-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 27 Sep 2016 09:34:24 +0000 (17:34 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 27 Sep 2016 09:34:24 +0000 (17:34 +0800)
commitd656122f8a1dfa29db4aec5d9dd54cd60b22864e
tree02b1aec919deb7e167da9e0275034fa3fdf0d740
parent13a18809e6a5bfe3ea3ebe007d1abc15099364f8
parent64ebf3955bde577624d197192bef91540732bc40
Merge branch 'MDL-37669-master' of git://github.com/andrewnicols/moodle
mod/forum/lang/en/forum.php
mod/forum/lib.php