ISPConfig3 devel
parent: 8ec5ab | patch | commitdiff
Till Brehm
2016-04-26 2e86dd528354a8267521e045a185f920683e4724
refs
author Till Brehm <tbrehm@ispconfig.org>
Tuesday, April 26, 2016 02:01 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Tuesday, April 26, 2016 02:01 -0400
commit2e86dd528354a8267521e045a185f920683e4724
tree 045b3f82468f28f0c3f9eca46a63da19e6ea92e2 tree | zip | gz
parent 8ec5ab5eb9627b5968e6b52a98ff47d228de864a view | diff
9bc7870a4a3e58bb235dd89d0031c3b31efe939b view | diff 
Merge branch 'master' into 'stable-3.1'

Fixes: #3846



See merge request !325
2 files modified
4 ■■■■■ changed files
interface/web/sites/templates/web_vhost_domain_edit.htm 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 2 ●●●●● diff | view | raw | blame | history