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

Browse Source

# Conflicts:
#	CHANGELOG.md
#	pom.xml
#	src/main/resources/plugin.yml

...

This commit is contained in:

mfnalex 2020-12-17 01:15:52 +01:00

parent 4db574c054 ee0358abd3

commit 63d21ffb0a

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