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

38b0fe8f

Commit 38b0fe8f authored 8 years ago by jnsc

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/stable-3.1' into Various_3.1_fixes

parents f4cdb2f0 b62d0810

No related branches found

No related tags found

Loading

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

docs/autoinstall_samples/autoinstall.conf_sample.php 1 addition, 0 deletions

docs/autoinstall_samples/autoinstall.conf_sample.php
docs/autoinstall_samples/autoinstall.ini.sample 1 addition, 0 deletions

docs/autoinstall_samples/autoinstall.ini.sample
install/install.php 1 addition, 1 deletion

install/install.php
interface/web/mail/lib/lang/ca_spamfilter_policy.lng 6 additions, 6 deletions

interface/web/mail/lib/lang/ca_spamfilter_policy.lng
interface/web/mail/lib/lang/fr_spamfilter_policy.lng 6 additions, 6 deletions

interface/web/mail/lib/lang/fr_spamfilter_policy.lng
server/plugins-available/apache2_plugin.inc.php 19 additions, 18 deletions

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

server/plugins-available/backup_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php 66 additions, 93 deletions

server/plugins-available/nginx_plugin.inc.php

with 101 additions and 125 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