gitlabFork/ISPConfig3.git - Solinfo Gitblit

Marius Cramer

2015-07-20 1f50209744f36c1602b11a3787dacfd3ea76527e

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Monday, July 20, 2015 04:23 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Monday, July 20, 2015 04:23 -0400
commit	1f50209744f36c1602b11a3787dacfd3ea76527e
tree	79c5067f956e3f7240edf530181b5d2b3c1f2d16 tree \| zip \| gz
parent	4e5e9b5acfdfddc1d8b671890d271a53e5598862 view \| diff 66fa9bddb59026ee508fd449adac93ea05e17f68 view \| diff

Merge branch 'master' into 'master'

Master

See merge request !211

56 files modified

	install/dist/lib/gentoo.lib.php	2 ●●●●● diff \| view \| raw \| blame \| history
	install/install.php	44 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	11 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/fedora_amavisd_conf.master	2 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/server.ini.master	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ar_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ar_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/bg_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/bg_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/br_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/br_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/cz_openvz_template.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/cz_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/de_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/de_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/el_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/el_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/en_openvz_template.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/en_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/es_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/es_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fi_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fi_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fr_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fr_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hr_openvz_template.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hr_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hu_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hu_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/id_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/id_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/it_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/it_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ja_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ja_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/nl_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/nl_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pl_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pl_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pt_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pt_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ro_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ro_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ru_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ru_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/se_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/se_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/sk_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/sk_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/tr_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/tr_openvz_vm.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/templates/openvz_template_advanced_edit.htm	10 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup.inc.php	23 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup_mail.inc.php	38 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/system.inc.php	27 ●●●●● diff \| view \| raw \| blame \| history