From 17d53616b36fef3b753fc408bfc600f360673333 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 22 Apr 2016 02:14:43 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 server/plugins-available/mongo_clientdb_plugin.inc.php~ |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/server/plugins-available/mongo_clientdb_plugin.inc.php b/server/plugins-available/mongo_clientdb_plugin.inc.php~
similarity index 100%
rename from server/plugins-available/mongo_clientdb_plugin.inc.php
rename to server/plugins-available/mongo_clientdb_plugin.inc.php~

--
Gitblit v1.9.1