Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Snippets Groups Projects

f964bf7e

Commit f964bf7e authored 9 years ago by Marius Burkard

Downloads
- Plain Diff

Merge branch 'stable-3.1'

parents 069b2fea 62f5b704

No related branches found

No related tags found

1 merge request!302Master

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

install/lib/installer_base.lib.php 1 addition, 1 deletion

install/lib/installer_base.lib.php
install/tpl/nginx_apps.vhost.master 2 additions, 2 deletions

install/tpl/nginx_apps.vhost.master
install/tpl/nginx_ispconfig.vhost.master 2 additions, 2 deletions

install/tpl/nginx_ispconfig.vhost.master
interface/web/admin/form/server_config.tform.php 1 addition, 1 deletion

interface/web/admin/form/server_config.tform.php
interface/web/dns/dns_import.php 25 additions, 129 deletions

interface/web/dns/dns_import.php
server/conf/nginx_apps.vhost.master 2 additions, 3 deletions

server/conf/nginx_apps.vhost.master
server/conf/php_fpm_pool.conf.master 3 additions, 1 deletion

server/conf/php_fpm_pool.conf.master
server/scripts/update_from_dev.sh 1 addition, 1 deletion

server/scripts/update_from_dev.sh
server/scripts/update_from_dev_stable.sh 1 addition, 1 deletion

server/scripts/update_from_dev_stable.sh

with 38 additions and 141 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