]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8eb7819 a804f2b)
Merge remote branch 'friendica/master'
authorFabrixxm <fabrix.xm@gmail.com>
Tue, 29 Jan 2013 10:57:53 +0000 (05:57 -0500)
committerFabrixxm <fabrix.xm@gmail.com>
Tue, 29 Jan 2013 10:57:53 +0000 (05:57 -0500)
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.