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
- Incidents

Snippets Groups Projects

5ec4395f

Commit 5ec4395f authored Oct 24, 2014 by Marius Cramer

Downloads
- Plain Diff

Merge branch 'stable-3.0.5'

Conflicts:
	install/dist/lib/fedora.lib.php
	install/dist/lib/opensuse.lib.php

parents 7972151d 67fedede

Branches

Tags

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

install/dist/conf/centos70.conf.php 219 additions, 0 deletions

install/dist/conf/centos70.conf.php
install/dist/lib/centos70.lib.php 164 additions, 0 deletions

install/dist/lib/centos70.lib.php
install/dist/lib/debian60.lib.php 7 additions, 4 deletions

install/dist/lib/debian60.lib.php
install/dist/lib/fedora.lib.php 5 additions, 4 deletions

install/dist/lib/fedora.lib.php
install/lib/install.lib.php 1 addition, 1 deletion

install/lib/install.lib.php
install/lib/installer_base.lib.php 6 additions, 5 deletions

install/lib/installer_base.lib.php

with 402 additions and 14 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