Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Snippets Groups Projects

b01718a0

Commit b01718a0 authored 9 years ago by Marius Burkard

Downloads
- Plain Diff

Merge branch 'master' into 'stable-3.1'

Master



See merge request !287

parents 7d2d6779 99fcaa5f

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

interface/lib/classes/validate_server.inc.php 61 additions, 0 deletions

interface/lib/classes/validate_server.inc.php
interface/web/admin/form/server_ip.tform.php 1 addition, 1 deletion

interface/web/admin/form/server_ip.tform.php
interface/web/admin/form/server_ip_map.tform.php 1 addition, 1 deletion

interface/web/admin/form/server_ip_map.tform.php
server/plugins-available/network_settings_plugin.inc.php 2 additions, 2 deletions

server/plugins-available/network_settings_plugin.inc.php

with 65 additions and 4 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