From 8cad78372e31c0f9c06be4654fbf59d85ef11f0e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 03:41:19 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 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