]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcaf400 d926595)
Merge branch 'friendika-master'
authorfabrixxm <fabrix.xm@gmail.com>
Mon, 3 Jan 2011 08:45:13 +0000 (09:45 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Mon, 3 Jan 2011 08:45:13 +0000 (09:45 +0100)
1  2 
index.php patch | diff1 | diff2 | blob | history

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