gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-04-27 13a336cf2c48089c3235a878e299c5244cc48aa9

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Monday, April 27, 2015 07:57 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Monday, April 27, 2015 07:57 -0400
commit	13a336cf2c48089c3235a878e299c5244cc48aa9
tree	801b3e1b3de14c629132113e8713c0c3cb873fd8 tree \| zip \| gz
parent	ab79c2c487ddcf9cd730a4c43a87159559e463d6 view \| diff 503bbb5b05c6ec24e1c5dc7afa71cee3ab8578c2 view \| diff

Merge branch 'master' into 'master'

added 'features' (like nfs:on) to openvz

See merge request !179

53 files modified

	install/sql/incremental/upd_dev_collection.sql	5 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/plugins/vm_openvz_plugin.inc.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/form/openvz_template.tform.php	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/form/openvz_vm.tform.php	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ar_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ar_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/bg_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/bg_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/br_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/br_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/cz_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/cz_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/de_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/el_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/el_openvz_vm.lng	1 ●●●●● 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	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/es_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/es_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fi_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fi_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fr_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fr_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hr_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hr_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hu_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hu_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/id_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/id_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/it_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/it_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ja_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ja_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/nl_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/nl_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pl_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pl_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pt_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pt_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ro_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ro_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ru_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ru_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/se_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/se_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/sk_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/sk_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/tr_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/tr_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/templates/openvz.conf.tpl	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/templates/openvz_template_advanced_edit.htm	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/templates/openvz_vm_advanced_edit.htm	9 ●●●●● diff \| view \| raw \| blame \| history