dev #38

Merged
lopar merged 22 commits from dev into master 2021-02-03 08:56:49 +00:00
Owner
No description provided.
lopar added 22 commits 2021-02-03 08:55:28 +00:00
51eb2c83b5 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	classes/Battles/User.php
#	user_abilities.php
lopar merged commit 34c608c501 into master 2021-02-03 08:56:49 +00:00
lopar deleted branch dev 2021-02-03 08:59:01 +00:00
Sign in to join this conversation.
No description provided.