ISPConfig3 devel
parent: 9f824a7b | patch | commit | ignore whitespace
Marius Burkard
2016-06-22 b542800232a61cc9fd82d39c54bc44468af30ce0 
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 files modified
4 ■■■■■ changed files
install/sql/ispconfig3.sql 2 ●●●●● patch | view | raw | blame | history
install/tpl/config.inc.php.master 2 ●●●●● patch | view | raw | blame | history 
 install/sql/ispconfig3.sql


@@ -2482,7 +2482,7 @@


-- Dumping data for table `sys_config`


--




INSERT INTO sys_config VALUES ('db','db_version','3.1b1');


INSERT INTO sys_config VALUES ('db','db_version','3.1dev');


INSERT INTO sys_config VALUES ('interface','session_timeout','0');




SET FOREIGN_KEY_CHECKS = 1;




 install/tpl/config.inc.php.master


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




//** Application


define('ISPC_APP_TITLE', 'ISPConfig');


define('ISPC_APP_VERSION', '3.1b1');


define('ISPC_APP_VERSION', '3.1dev');


define('DEVSYSTEM', 0);