]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 15 Nov 2012 20:52:35 +0000 (21:52 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 15 Nov 2012 20:52:35 +0000 (21:52 +0100)
1  2 
object/Item.php
view/theme/vier/search_item.tpl
view/theme/vier/wall_thread.tpl

diff --cc object/Item.php
Simple merge
Simple merge
Simple merge