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

ec9b13ed

Commit ec9b13ed authored 4 years ago by Florian Schaal

Downloads
- Plain Diff

Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop

parents 28d792af a056850e

No related branches found

No related tags found

1 merge request!1284Develop

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

install/install.php 12 additions, 1 deletion

install/install.php
install/lib/installer_base.lib.php 26 additions, 17 deletions

install/lib/installer_base.lib.php
install/update.php 12 additions, 1 deletion

install/update.php
server/conf/sieve_filter.master 2 additions, 0 deletions

server/conf/sieve_filter.master
server/plugins-available/powerdns_plugin.inc.php 3 additions, 3 deletions

server/plugins-available/powerdns_plugin.inc.php

with 55 additions and 22 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