Merge remote-tracking branch 'origin/feature/v6/slf4j' into feature/v6/slf4j

Browse Source

# Conflicts:
#	Bukkit/pom.xml
#	Core/pom.xml

...

This commit is contained in:

Alexander Söderberg 2020-07-13 22:52:10 +02:00

parent a1f262b5b2 1388f280e6

commit d648a6d3db

No known key found for this signature in database

GPG Key ID: C0207FF7EA146678

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

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

Diff Content Not Available