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

8f6e62fe

Commit 8f6e62fe authored 7 years ago by Marius Burkard

Downloads
- Plain Diff

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

parents 386c93a7 cee6f9f9

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

install/dist/lib/debian60.lib.php 4 additions, 1 deletion

install/dist/lib/debian60.lib.php
install/dist/lib/fedora.lib.php 7 additions, 0 deletions

install/dist/lib/fedora.lib.php
install/lib/installer_base.lib.php 4 additions, 1 deletion

install/lib/installer_base.lib.php
install/tpl/system.ini.master 2 additions, 0 deletions

install/tpl/system.ini.master
interface/web/admin/form/system_config.tform.php 2 additions, 2 deletions

interface/web/admin/form/system_config.tform.php
server/conf/vhost.conf.master 11 additions, 11 deletions

server/conf/vhost.conf.master

with 30 additions and 15 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