]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b36927 1d6dd16)
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Sun, 23 Dec 2012 06:59:37 +0000 (22:59 -0800)
committerfriendica <info@friendica.com>
Sun, 23 Dec 2012 06:59:37 +0000 (22:59 -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.