ISPConfig3 devel
parent: 69014b | patch | commitdiff
Marius Burkard
2016-04-29 d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc
refs
author Marius Burkard <m.burkard@pixcept.de>
Friday, April 29, 2016 07:49 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Friday, April 29, 2016 07:49 -0400
commitd30f2c69b1fbfcb9bebe17996d11dc4863afd8bc
tree e1a13058b736cc47e62428dc2a07071a9ee3a911 tree | zip | gz
parent 69014bdb08a1720250b79744b10b0a618b4b902b view | diff
fe0bcd10e94d1ea8b3a1e0fa67f54a472e3136b2 view | diff 
Merge branch 'master' into 'stable-3.1'

Master



See merge request !331
6 files modified
11 ■■■■■ changed files
interface/lib/classes/tform_base.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/domain_list.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_soa.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 1 ●●●●● diff | view | raw | blame | history