Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

ISPConfig 3
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

7b26eae1

Commit 7b26eae1 authored 9 years ago by Marius Cramer

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Master

See merge request !222

parents eb1177f6 458ad7c7

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

install/sql/incremental/upd_dev_collection.sql 2 additions, 0 deletions

install/sql/incremental/upd_dev_collection.sql
install/sql/ispconfig3.sql 1 addition, 0 deletions

install/sql/ispconfig3.sql
install/tpl/master_cf_amavis10025.master 1 addition, 0 deletions

install/tpl/master_cf_amavis10025.master
install/tpl/master_cf_amavis10027.master 1 addition, 0 deletions

install/tpl/master_cf_amavis10027.master
interface/lib/plugins/vm_openvz_plugin.inc.php 29 additions, 2 deletions

interface/lib/plugins/vm_openvz_plugin.inc.php
interface/web/vm/form/openvz_vm.tform.php 6 additions, 0 deletions

interface/web/vm/form/openvz_vm.tform.php
interface/web/vm/openvz_vm_edit.php 13 additions, 0 deletions

interface/web/vm/openvz_vm_edit.php
interface/web/vm/templates/openvz_vm_additional_ip_edit.htm 19 additions, 0 deletions

interface/web/vm/templates/openvz_vm_additional_ip_edit.htm

with 72 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment