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

b769cc8e

Commit b769cc8e authored 11 years ago by Florian Schaal

Downloads
- Plain Diff

Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

parents 6ff8d7bc 11ca0c53

No related branches found

No related tags found

2 merge requests!88Fix Update errors,!72Master

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

install/dist/lib/opensuse.lib.php 3 additions, 1 deletion

install/dist/lib/opensuse.lib.php
install/lib/install.lib.php 1 addition, 0 deletions

install/lib/install.lib.php
install/tpl/apache_ispconfig.conf.master 3 additions, 3 deletions

install/tpl/apache_ispconfig.conf.master
server/conf/apache_ispconfig.conf.master 3 additions, 3 deletions

server/conf/apache_ispconfig.conf.master
server/conf/vhost.conf.master 2 additions, 2 deletions

server/conf/vhost.conf.master
server/lib/classes/cron.d/500-backup.inc.php 1 addition, 1 deletion

server/lib/classes/cron.d/500-backup.inc.php

with 13 additions and 10 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