From b25f400cd6bc255b01e05ac274f050ba4039a411 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 21 Dec 2015 05:41:34 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

---
 server/cron_daily.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/cron_daily.php b/server/cron_daily.php
index a557d47..ff7a095 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -3,4 +3,4 @@
 // the cron daily file is no longer used and was replaced by cron.php
 
 
-?>
+?>
\ No newline at end of file

--
Gitblit v1.9.1