Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

ISPConfig 3
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

a66bbd6c

Commit a66bbd6c authored 10 years ago by Marius Cramer

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Master

See merge request !138

parents c28bb432 208a069f

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

interface/web/mail/mail_domain_dkim_create.php 1 addition, 1 deletion

interface/web/mail/mail_domain_dkim_create.php
server/lib/classes/cron.d/500-backup.inc.php 31 additions, 35 deletions

server/lib/classes/cron.d/500-backup.inc.php
server/lib/classes/cron.d/500-backup_mail.inc.php 15 additions, 23 deletions

server/lib/classes/cron.d/500-backup_mail.inc.php
server/lib/classes/system.inc.php 16 additions, 0 deletions

server/lib/classes/system.inc.php
server/plugins-available/apache2_plugin.inc.php 6 additions, 12 deletions

server/plugins-available/apache2_plugin.inc.php
server/plugins-available/backup_plugin.inc.php 5 additions, 33 deletions

server/plugins-available/backup_plugin.inc.php
server/plugins-available/mail_plugin.inc.php 10 additions, 26 deletions

server/plugins-available/mail_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php 22 additions, 0 deletions

server/plugins-available/nginx_plugin.inc.php

with 106 additions and 130 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