ISPConfig3 devel
parent: 7d2d67 | patch | commitdiff
Marius Burkard
2016-02-25 b01718a0ae2b53c18c01f1374799a00a0c11279f
refs
author Marius Burkard <m.burkard@pixcept.de>
Thursday, February 25, 2016 05:13 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Thursday, February 25, 2016 05:13 -0500
commitb01718a0ae2b53c18c01f1374799a00a0c11279f
tree 259a3ec0e9c37bbbd4aa47446d18e064cb2e38b5 tree | zip | gz
parent 7d2d6779868f401cd0868de35cda78a74d8e0913 view | diff
99fcaa5fe1ad2b813de0bb9e24f63cdc8d18837c view | diff 
Merge branch 'master' into 'stable-3.1'

Master



See merge request !287
1 files added
3 files modified
69 ■■■■■ changed files
interface/lib/classes/validate_server.inc.php 61 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_ip.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_ip_map.tform.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/network_settings_plugin.inc.php 4 ●●●●● diff | view | raw | blame | history