gitlabFork/ISPConfig3.git - Solinfo Gitblit

Marius Cramer

2015-06-22 5b3c29178704c047d4020df2ae445ff01c6e1f3a

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Monday, June 22, 2015 08:48 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Monday, June 22, 2015 08:48 -0400
commit	5b3c29178704c047d4020df2ae445ff01c6e1f3a
tree	46813739bf43846ebe2d0544baa34eb9e5732608 tree \| zip \| gz
parent	96c95ad8ca4c460394b64a4d0ce7d2f0622125af view \| diff eac49003df65e223905c7e7f4458a752b9caf146 view \| diff

Merge branch 'master' into 'master'

Master

See merge request !203

78 files modified

	install/tpl/system.ini.master	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/system_config.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ar_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/bg_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/br_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/el_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/es_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fi_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fr_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hr_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hu_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/id_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/it_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ja_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/nl_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pl_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pt_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ro_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ru_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/se_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/sk_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/tr_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/system_config_misc_edit.htm	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/index.php	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ar_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/bg_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/br_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/el_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/es_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fi_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fr_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hr_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hu_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/id_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ja_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/nl_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pl_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pt_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ro_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ru_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/sk_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/tr_web_vhost_domain.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_vhost_domain_edit.htm	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_vhost_domain_edit.php	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/themes/default/templates/main.tpl.htm	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/ar_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/bg_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/br_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/cz_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/de_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/el_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/en_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/es_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/fi_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/fr_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/hr_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/hu_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/id_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/it_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/ja_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/nl_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/pl_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/pt_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/ro_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/ru_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/se_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/sk_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/tr_resync.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/resync.php	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/templates/resync.htm	7 ●●●●● diff \| view \| raw \| blame \| history