new-combats/game
3
0
Fork 0
Code Issues 23 Pull Requests Releases Wiki Activity
a53eab9795
game/_incl_data
History
Ivor Barhansky a53eab9795 Merge remote-tracking branch 'origin/dev-php74' into dev-php74 
# Conflicts:
#	_incl_data/class/Battle.php
#	_incl_data/class/FightRequest.php
#	_incl_data/class/Filter.php
#	_incl_data/class/Magic.php
#	_incl_data/class/Priems.php
#	_incl_data/class/Quests.php
#	_incl_data/class/Season.php
#	_incl_data/class/User.php
#	_incl_data/class/__db_connect.php
#	_incl_data/class/priem/244.php
#	_incl_data/class/priem/263.php
#	_incl_data/class/priem/265.php
#	_incl_data/class/priem/267.php
#	buttons.php
#	cron_bs.php
#	cron_dungeon_getOut.php
#	cron_zv.php
#	dn_editor.php
#	dn_editor_bots.php
#	dn_editor_botsAll.php
#	dn_editor_bots_itms.php
#	enter.php
#	hmonitor.php
#	logs.php
#	main.php
#	main_bot.php
#	map.php
#	modules_data/_inv.php
#	modules_data/_umenie.php
#	modules_data/btl_.php
#	modules_data/location/btl_.php
#	modules_data/titul.php
#	myexp.php
#	obraz.php
#	online.php
#	register.php
#	ruin_characteristics.php
#	spam.php
2022-12-19 21:40:33 +02:00
..
class Merge remote-tracking branch 'origin/dev-php74' into dev-php74 2022-12-19 21:40:33 +02:00
__config.php 7.4 to the go 2022-12-19 20:26:14 +02:00
.htaccess 7.4 to the go 2022-12-19 20:26:14 +02:00
autoload.php 7.4 to the go 2022-12-19 20:26:14 +02:00
mails.php dev-runes (#7) 2022-06-11 11:32:31 +00:00