Merge develop into 1404_reworked_autocomplete

Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
This commit is contained in:
rabuzarus 2016-04-14 16:23:51 +02:00
commit 01b02dbcaa
723 changed files with 40077 additions and 44824 deletions

View file

@ -13,7 +13,6 @@
if($(listID).is(":visible")) {
$(listID).hide();
$(listID+"-wrapper").show();
alert($(listID+"-wrapper").attr("id"));
}
else {
$(listID).show();