Merge remote-tracking branch 'origin/dev-battle-fighterclass' into dev-battle-fighterclass

Browse Source

# Conflicts:
#	_incl_data/class/Battle.php

...

This commit is contained in:

Ivor Barhansky

2024-02-09 22:08:35 +02:00

parent 1a05960ddc 4470f80098

commit 7986d33ab6

9 changed files with 963 additions and 1429 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

_incl_data/class/Battle.php

+601 -1103

File diff suppressed because it is too large Load Diff