]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf19e62 e27395b)
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Sun, 5 Aug 2012 00:03:32 +0000 (17:03 -0700)
committerfriendica <info@friendica.com>
Sun, 5 Aug 2012 00:03:32 +0000 (17:03 -0700)
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.