From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 30 Jan 2016 07:44:29 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/sites/form/database.tform.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php
index da3bf9c..aef56f5 100644
--- a/interface/web/sites/form/database.tform.php
+++ b/interface/web/sites/form/database.tform.php
@@ -90,7 +90,7 @@
 			'formtype' => 'SELECT',
 			'default' => 'mysql',
 			'value'  => array(
-				'mongo' => 'MongoDB',
+				/*'mongo' => 'MongoDB',*/
 				'mysql' => 'MySQL'
 			)
 		),

--
Gitblit v1.9.1