]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e80642 d284f80)
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
authorFabio Comuni <fabrix.xm@gmail.com>
Thu, 15 Sep 2011 08:39:41 +0000 (10:39 +0200)
committerFabio Comuni <fabrix.xm@gmail.com>
Thu, 15 Sep 2011 08:39:41 +0000 (10:39 +0200)
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.