Merge remote-tracking branch 'origin/master'

# Conflicts:
#	admin/admin.php
#	classes/Battles/User.php
#	classes/Battles/UserStats.php
#	fbattle.php
#	functions.php
This commit is contained in:
lopar
2022-08-10 02:34:12 +03:00
17 changed files with 351 additions and 257 deletions
-3
View File
@@ -6,9 +6,6 @@
* Project name: Battles-Game
*/
use Battles\Database\Db;
use Battles\User;
include_once 'classes/Database/db.php';
include_once 'classes/Database/Mysql.php';
include_once 'classes/Database/Statement.php';