xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-13 16:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/evader1337/TravianZ into evader1337-master

Browse Source 
# Conflicts:
#	GameEngine/Database/db_MYSQL.php
#	Templates/Build/avaliable.tpl
#	Templates/Message/inbox.tpl
This commit is contained in:
Martin Ambrus
2017-08-28 14:18:24 +02:00
parent 1a4005cd67 cdfee7780b
commit 9261a4a4b2
93 changed files with 5041 additions and 9207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/data/constant_format.tpl
-8
View File
@@ -206,14 +206,6 @@ define("SQL_DB", "%SDB%");
// ***** Database - Table Prefix
define("TB_PREFIX", "%PREFIX%");
// ***** Database type
// 0 = MYSQL
// 1 = MYSQLi
// default: 1
define("DB_TYPE", %CONNECTT%);
////////////////////////////////////
// **** EXTRA SETTINGS **** //
////////////////////////////////////