Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Snippets Groups Projects

14c2d8c2

Commit 14c2d8c2 authored 9 years ago by Marius Burkard

Downloads
- Plain Diff

Merge branch 'stable-3.1'

parents 88c307b0 7456a4f5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

install/tpl/apache_ispconfig.conf.master
interface/acme-challenge/empty.dir 1 addition, 0 deletions

interface/acme-challenge/empty.dir
interface/web/sites/lib/module.conf.php 5 additions, 0 deletions

interface/web/sites/lib/module.conf.php
server/conf/nginx_vhost.conf.master 14 additions, 0 deletions

server/conf/nginx_vhost.conf.master
server/plugins-available/apache2_plugin.inc.php 14 additions, 15 deletions

server/plugins-available/apache2_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php 18 additions, 19 deletions

server/plugins-available/nginx_plugin.inc.php

with 54 additions and 34 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