Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa

application/config/database.php

@@ -74,11 +74,11 @@ $active_group = 'default';
 $query_builder = TRUE;
 
 $db['default'] = array(
-	'dsn'	   => '',
-	'hostname' => '192.168.140.123',
-	'username' => 'root',
-    'password' => 'Golden_123',
-    'database' => 'tobin_eventTimeOut',
+	'dsn'	=> '',
+	'hostname' => 'localhost',
+	'username' => 'nuvento_timeout',
+	'password' => 'Golden_123',
+	'database' => 'nuvento_timeout',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,