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

..

classes

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

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

jobs

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

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

froxlor_master_cronjob.php

also re-generate bind configs (if enabled) when using --force with the cronjob

2015-03-11 11:21:17 +01:00