From fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sun, 07 Jun 2015 12:16:19 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

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

diff --git a/server/cron_daily.php b/server/cron_daily.php
index 19fe2ad..a557d47 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -1,5 +1,6 @@
 <?php
 
-# the cron daily file is no longer used and was replaced by cron.php
+// the cron daily file is no longer used and was replaced by cron.php
+
 
 ?>

--
Gitblit v1.9.1