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)
1  2 
include/conversation.php
mod/photos.php
view/theme/duepuntozero/style.css

Simple merge
diff --cc mod/photos.php
Simple merge
Simple merge