gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-02-25 3faab0ca9e097627420aec19c01ad8336fe79c22

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, February 25, 2014 03:01 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, February 25, 2014 03:01 -0500
commit	3faab0ca9e097627420aec19c01ad8336fe79c22
tree	9c509aabec751e93ee007a68ba4585d559f845b9 tree \| zip \| gz
parent	83c58ebb377d9aab7003f2c123edc166668099c4 view \| diff f4de70ad5ce89191f23704c0f8c031cd733cc406 view \| diff

Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/web/sites/lib/lang/de_web_folder.lng
	interface/web/sites/lib/lang/de_web_folder_user.lng
	interface/web/sites/lib/lang/de_web_vhost_domain.lng
	interface/web/sites/lib/lang/en_web_domain.lng
	server/lib/classes/db_mysql.inc.php

1 files added

40 files modified

	install/sql/incremental/upd_0070.sql	1 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	1 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/debian6_dovecot-sql.conf.master	2 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/fedora_dovecot-sql.conf.master	2 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/opensuse_dovecot-sql.conf.master	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/client.tform.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_a.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_aaaa.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_alias.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_cname.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_hinfo.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_mx.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_ns.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_ptr.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_rp.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_srv.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_txt.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_a.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_aaaa.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_cname.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_hinfo.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_mx.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_ns.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_ptr.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_rp.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_srv.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_txt.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/mail_user_edit.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/monitor/show_sys_state.php	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_folder.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_folder_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_vhost_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_folder.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_folder_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_folder_edit.php	36 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_folder_user_edit.php	36 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_vhost_domain_edit.php	29 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/aps_installer.inc.php	15 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	8 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/nginx_plugin.inc.php	8 ●●●●● diff \| view \| raw \| blame \| history