Merge branch 'MDL-55364-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Aug 2017 10:34:18 +0000 (11:34 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Aug 2017 10:34:18 +0000 (11:34 +0100)
1  2 
mod/forum/lib.php

Simple merge