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
..
bg	…
ca	…
cs	…
de	…
eo	…
es	…
fonts	…
fr	…
install	…
is	…
it	…
nb-no	…
nl	…
pl	…
pt-br	…
ro	…
ru	…
smarty3	…
sv	…
templates	Merge develop into 1404_reworked_autocomplete	2016-04-14 16:23:51 +02:00
theme	Merge develop into 1404_reworked_autocomplete	2016-04-14 16:23:51 +02:00
zh-cn	…
.htaccess	…
custom_tinymce.css	…
default.php	…
global.css	Merge develop into 1404_reworked_autocomplete	2016-04-14 16:23:51 +02:00
minimal.php	…