Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	src/main/java/fr/xephi/authme/listener/PlayerListener.java

...

This commit is contained in:

Sattera

2023-04-06 09:38:13 +08:00

parent bc43afe3d0 baaabb22d4

commit 11c5237950

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