From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

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

diff --git a/server/cron_daily.php b/server/cron_daily.php
index 19fe2ad..ff7a095 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
 
-?>
+
+?>
\ No newline at end of file

--
Gitblit v1.9.1