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

842b5c34

Commit 842b5c34 authored 9 years ago by Marius Cramer

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Master

See merge request !225

parents 57963434 d6cd11df

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

install/tpl/server.ini.master 1 addition, 1 deletion

install/tpl/server.ini.master
interface/web/admin/form/server_config.tform.php 1 addition, 3 deletions

interface/web/admin/form/server_config.tform.php
server/lib/classes/cron.d/500-backup.inc.php 1 addition, 1 deletion

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

server/lib/classes/cron.d/500-backup_mail.inc.php
server/plugins-available/backup_plugin.inc.php 7 additions, 2 deletions

server/plugins-available/backup_plugin.inc.php

with 11 additions and 8 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