ISPConfig3 devel
parent: 9fd930 | patch | commitdiff
Marius Burkard
2016-03-08 81a4dc5a1f17848bf544dae54582097b93c295cc
refs
author Marius Burkard <m.burkard@pixcept.de>
Tuesday, March 8, 2016 08:30 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Tuesday, March 8, 2016 08:30 -0500
commit81a4dc5a1f17848bf544dae54582097b93c295cc
tree d708f5381067cbc1fb57e2f2cccb21ef98e4a6d8 tree | zip | gz
parent 9fd93035af2c0c1f4eb36ca5f05a235cf68f4771 view | diff
3279f891ed89470b09fe9137970ca86fa5c50d5d view | diff 
Merge branch 'master' into 'stable-3.1'

Master



See merge request !293
2 files modified
8 ■■■■■ changed files
install/tpl/nginx_apps.vhost.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/nginx_ispconfig.vhost.master 4 ●●●●● diff | view | raw | blame | history