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

20e01532

Commit 20e01532 authored 11 years ago by Marius Cramer

Downloads
- Plain Diff

Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

parents ddb461f5 2e5b1afd

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

install/tpl/server.ini.master 1 addition, 0 deletions

install/tpl/server.ini.master
interface/web/admin/form/server_config.tform.php 6 additions, 0 deletions

interface/web/admin/form/server_config.tform.php
interface/web/admin/lib/lang/de_server_config.lng 1 addition, 0 deletions

interface/web/admin/lib/lang/de_server_config.lng
interface/web/admin/lib/lang/en_server_config.lng 1 addition, 0 deletions

interface/web/admin/lib/lang/en_server_config.lng
interface/web/admin/templates/server_config_server_edit.htm 6 additions, 0 deletions

interface/web/admin/templates/server_config_server_edit.htm
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 6 additions, 15 deletions

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

server/plugins-available/apache2_plugin.inc.php
server/plugins-available/mail_plugin.inc.php 3 additions, 2 deletions

server/plugins-available/mail_plugin.inc.php

with 26 additions and 19 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