]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfb3ee6 30b7c68)
Merge remote-tracking branch 'friendika/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Fri, 30 Sep 2011 12:31:20 +0000 (14:31 +0200)
committerFabio Comuni <fabrix.xm@gmail.com>
Fri, 30 Sep 2011 12:31:20 +0000 (14:31 +0200)
1  2 
include/conversation.php patch | diff1 | diff2 | blob | history

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