]> git.mxchange.org Git - friendica.git/commit - view/theme/loozah/jot.tpl
Merge remote-tracking branch 'friendica/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Fri, 6 Jan 2012 08:11:48 +0000 (09:11 +0100)
committerFabio Comuni <fabrix.xm@gmail.com>
Fri, 6 Jan 2012 08:11:48 +0000 (09:11 +0100)
commitf9b0af6f2f0c57481a0b5b3dc269b2389f3fa872
treef06c87479be60f3c601cbeed6088e6e74d97785c
parentefe308b5ac9ac7e8d399fb880f31b6967de8fec1
parentc3ada095f4156bba01e77d2d250d5821ba5e859e
Merge remote-tracking branch 'friendica/master'
include/conversation.php
mod/photos.php
view/theme/duepuntozero/style.css