projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8729e59 54672f1)
Merge branch 'MDL-24860_messaging_providers' of git://github.com/andyjdavis/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 12:39:20 +0000 (13:39 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 12:39:20 +0000 (13:39 +0100)
Conflicts:
mod/lesson/version.php

1  2 
lib/datalib.php patch | diff1 | diff2 | blob | history
mod/forum/lib.php patch | diff1 | diff2 | blob | history

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