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

Browse Source

# Conflicts:
#	classes/Battles/User.php
#	user_abilities.php

...

This commit is contained in:

lopar

2021-02-02 23:56:04 +02:00

parent 8442eb4e7b 2ccb5ef128

commit 51eb2c83b5

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

Diff Content Not Available