Merge branch 'MDL-51998_master' of https://github.com/nadavkav/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 01:56:29 +0000 (09:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 01:56:29 +0000 (09:56 +0800)
1  2 
mod/forum/lib.php

Simple merge