gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-08-27 7b26eae1b657e81aefe2a50e1c15518f0f6ee935

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, August 27, 2015 02:45 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, August 27, 2015 02:45 -0400
commit	7b26eae1b657e81aefe2a50e1c15518f0f6ee935
tree	03de2de230867ff34e3a66fbce42997a5bb7f358 tree \| zip \| gz
parent	eb1177f61b0299bb011ffc1180e0d3c7fc1e87fc view \| diff 458ad7c701ef0c0ca2cf5d9818f98656a8846408 view \| diff

Merge branch 'master' into 'master'

Master

See merge request !222

1 files added

7 files modified

	install/sql/incremental/upd_dev_collection.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	1 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/master_cf_amavis10025.master	1 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/master_cf_amavis10027.master	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/plugins/vm_openvz_plugin.inc.php	31 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/form/openvz_vm.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/openvz_vm_edit.php	13 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/templates/openvz_vm_additional_ip_edit.htm	19 ●●●●● diff \| view \| raw \| blame \| history