Merge remote-tracking branch 'friendica/master' into mobile

author Fabio Comuni <fabrix.xm@gmail.com>

Mon, 13 Feb 2012 08:46:42 +0000 (09:46 +0100)

committer Fabio Comuni <fabrix.xm@gmail.com>

Mon, 13 Feb 2012 08:46:42 +0000 (09:46 +0100)
author Fabio Comuni <fabrix.xm@gmail.com>
Mon, 13 Feb 2012 08:46:42 +0000 (09:46 +0100)
committer Fabio Comuni <fabrix.xm@gmail.com>
Mon, 13 Feb 2012 08:46:42 +0000 (09:46 +0100)
diff --cc include/conversation.php
Simple merge
diff --cc view/theme/quattro/quattro.less
Simple merge
diff --cc view/theme/quattro/style.css
Simple merge
author	Fabio Comuni <fabrix.xm@gmail.com>
	Mon, 13 Feb 2012 08:46:42 +0000 (09:46 +0100)
committer	Fabio Comuni <fabrix.xm@gmail.com>
	Mon, 13 Feb 2012 08:46:42 +0000 (09:46 +0100)
		1	2
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/quattro/quattro.less	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/quattro/style.css	patch \|	diff1 \|	diff2 \|	blob \| history