]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'friendica/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Fri, 6 Jan 2012 08:10:21 +0000 (09:10 +0100)
committerFabio Comuni <fabrix.xm@gmail.com>
Fri, 6 Jan 2012 08:10:21 +0000 (09:10 +0100)
commita9670cbb7d2cab644ee9d499aade98164f92631a
treef136b6448ecd23ec7c987bf26b8d49be25a8aca5
parent93563370c96848948d28ed39e13284ebaf7f430a
parent53878625f6ecc014283cefbd84f92b6f1294b8a3
Merge remote-tracking branch 'friendica/master'
include/conversation.php
view/jot-header.tpl
view/jot.tpl
view/theme/duepuntozero/jot.tpl