From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

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