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

Browse Source

# Conflicts:
#	classes/Battles/UserInfo.php
#	main.php

...

This commit is contained in:

lopar

2021-03-11 20:21:00 +02:00

parent 484695af10 26ed4cd286

commit 1d2128830f

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