]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c88c251 a1d5026)
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 11 Apr 2012 17:35:51 +0000 (19:35 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 11 Apr 2012 17:35:51 +0000 (19:35 +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.