friendica/view/theme/quattro/lilac
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
..
colors.less tweak quattro theme 2014-09-17 10:59:19 +02:00
Makefile
style.css Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00
style.less