]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f80467 c5b8082)
Merge remote branch 'friendica/master'
authorFabrixxm <fabrix.xm@gmail.com>
Fri, 15 Feb 2013 08:17:59 +0000 (03:17 -0500)
committerFabrixxm <fabrix.xm@gmail.com>
Fri, 15 Feb 2013 08:17:59 +0000 (03:17 -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.