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

21 KiB

Raw Blame History

View Raw