friendica/view/theme/duepuntozero
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
..
deriv
templates
bbedit.png
border.jpg
config.php
editicons.png
ff-16.jpg
file.gif
friendika-16.png
head.jpg
lock.cur
login-bg.gif
photo-menu.jpg
screenshot.jpg
shiny.png
style.css Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00
style.php
theme.php