Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

 install/tpl/config.inc.php.master

@@ -56,7 +56,7 @@

//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.1dev');
define('ISPC_APP_VERSION', '3.1b1');
define('DEVSYSTEM', 0);


@@ -83,7 +83,7 @@
//** Database settings for the master DB. This setting is only used in multiserver setups
$conf['dbmaster_type']         = 'mysql';
$conf['dbmaster_host']         = '{mysql_master_server_host}';
$conf['dbmaster_host']          = '{mysql_master_server_port}';
$conf['dbmaster_port']         = '{mysql_master_server_port}';
$conf['dbmaster_database']      = '{mysql_master_server_database}';
$conf['dbmaster_user']         = '{mysql_master_server_ispconfig_user}';
$conf['dbmaster_password']      = '{mysql_master_server_ispconfig_password}';