]> git.mxchange.org Git - friendica.git/commit
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)
commite67062d9cfba398a237f261cc6104e76cc91359b
tree6a732dbfc65805069fbe3c20b176a8209f3aaf24
parentfce18fd2239de5fe99317d6bee23e5db8b342d02
parenteef8fbe52c753228370256271b0df0c7bb16c53e
Merge remote-tracking branch 'upstream/master'
object/Item.php
view/theme/vier/search_item.tpl
view/theme/vier/wall_thread.tpl