]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8c9015 735e6bb)
Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup
authorfabrixxm <fabrix.xm@gmail.com>
Sun, 7 Sep 2014 12:28:03 +0000 (14:28 +0200)
committerfabrixxm <fabrix.xm@gmail.com>
Sun, 7 Sep 2014 12:28:03 +0000 (14:28 +0200)
1  2 
boot.php patch | diff1 | diff2 | blob | history
mod/admin.php patch | diff1 | diff2 | blob | history

diff --cc boot.php
Simple merge
diff --cc mod/admin.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.