]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de5a21b 0e95b6b)
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Sun, 11 Nov 2012 08:30:37 +0000 (00:30 -0800)
committerfriendica <info@friendica.com>
Sun, 11 Nov 2012 08:30:37 +0000 (00:30 -0800)
1  2 
boot.php patch | diff1 | diff2 | blob | history

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