From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 04 May 2016 07:27:53 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 server/lib/classes/cron.d/100-monitor_mongodb.inc.php~ |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/server/lib/classes/cron.d/100-monitor_mongodb.inc.php b/server/lib/classes/cron.d/100-monitor_mongodb.inc.php~
similarity index 100%
rename from server/lib/classes/cron.d/100-monitor_mongodb.inc.php
rename to server/lib/classes/cron.d/100-monitor_mongodb.inc.php~

--
Gitblit v1.9.1