From a5714c39c76695af5b2220e93a4ac3121a9d83a1 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 17 Nov 2015 12:59:40 -0500
Subject: [PATCH] Merge branch 'stable-3.0.5'

---
 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