]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4758dc1 ee6044a)
Merge remote branch 'friendica/master' into blog-like
authorFabrixxm <fabrix.xm@gmail.com>
Thu, 20 Sep 2012 06:48:54 +0000 (02:48 -0400)
committerFabrixxm <fabrix.xm@gmail.com>
Thu, 20 Sep 2012 06:48:54 +0000 (02:48 -0400)
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.