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

486e424d

Commit 486e424d authored 9 years ago by Marius Burkard

Downloads
- Plain Diff

Merge branch 'stable-3.1'

parents 0e8c9aee 606949b3

1 merge request!277fixed installer - ispconfig/ispconfig3#3750

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

install/tpl/apache_ispconfig.conf.master 5 additions, 2 deletions

install/tpl/apache_ispconfig.conf.master
interface/acme/.well-known/acme-challenge/empty.dir 0 additions, 0 deletions

interface/acme/.well-known/acme-challenge/empty.dir
server/conf/nginx_vhost.conf.master 1 addition, 1 deletion

server/conf/nginx_vhost.conf.master
server/plugins-available/apache2_plugin.inc.php 1 addition, 1 deletion

server/plugins-available/apache2_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php 1 addition, 1 deletion

server/plugins-available/nginx_plugin.inc.php

with 8 additions and 5 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