projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c3b218 28c0c4a)
Merge branch 'wip-MDL-48377-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 01:02:08 +0000 (14:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 01:02:08 +0000 (14:02 +1300)
1  2 
mod/forum/lib.php patch | diff1 | diff2 | blob | history
mod/forum/tests/mail_test.php patch | diff1 | diff2 | blob | history

diff --cc mod/forum/lib.php
Simple merge
diff --cc mod/forum/tests/mail_test.php
Simple merge
Moodle official production repository