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

2a24c613

Commit 2a24c613 authored 9 years ago by Marius Burkard

Downloads
- Plain Diff

Merge branch 'stable-3.1'

parents 2f74cf27 9fd93035

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

server/conf/php_fpm_pool.conf.master 1 addition, 1 deletion

server/conf/php_fpm_pool.conf.master
server/plugins-available/apache2_plugin.inc.php 56 additions, 44 deletions

server/plugins-available/apache2_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php 5 additions, 36 deletions

server/plugins-available/nginx_plugin.inc.php

with 62 additions and 81 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