Merge branch 'MDL-61010-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 08:53:48 +0000 (09:53 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 08:53:48 +0000 (09:53 +0100)
1  2 
mod/forum/lib.php

Simple merge