Chris Vigelius 19d94471d9 Merge branch 'master' into vhost_config_variables, and replace IS_SSL with SCHEME ...

Conflicts (resolved):
	lng/english.lng.php
	lng/german.lng.php

2015-07-30 11:35:26 +02:00

..

dutch.lng.php

change admin_configfiles to handle the new XML-configs instead of the old php-arrays

2015-02-09 13:54:55 +01:00

english.lng.php

Merge branch 'master' into vhost_config_variables, and replace IS_SSL with SCHEME

2015-07-30 11:35:26 +02:00

french.lng.php

change admin_configfiles to handle the new XML-configs instead of the old php-arrays

2015-02-09 13:54:55 +01:00

german.lng.php

Merge branch 'master' into vhost_config_variables, and replace IS_SSL with SCHEME

2015-07-30 11:35:26 +02:00

italian.lng.php

change admin_configfiles to handle the new XML-configs instead of the old php-arrays

2015-02-09 13:54:55 +01:00

lng_references.php

improve ip-address description in admin_domains, thx to datenfalke and Sephi

2013-09-28 12:55:43 +02:00

portugues.lng.php

change admin_configfiles to handle the new XML-configs instead of the old php-arrays

2015-02-09 13:54:55 +01:00

swedish.lng.php

change admin_configfiles to handle the new XML-configs instead of the old php-arrays

2015-02-09 13:54:55 +01:00