]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3b499f c0c4c46)
Merge remote-tracking branch 'friendica/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Tue, 20 Dec 2011 16:18:19 +0000 (17:18 +0100)
committerFabio Comuni <fabrix.xm@gmail.com>
Tue, 20 Dec 2011 16:18:19 +0000 (17:18 +0100)
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.