projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1406480 386b6d0)
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
authorDomovoy <domovoy@errlock.org>
Thu, 23 Aug 2012 08:25:22 +0000 (10:25 +0200)
committerDomovoy <domovoy@errlock.org>
Thu, 23 Aug 2012 08:25:22 +0000 (10:25 +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.