Merge branch 'master' of https://github.com/EpicJosch/MurderMystery · Plugily-Projects/MurderMystery@6dad783 · GitHub

Commit

Merge branch 'master' of https://github.com/EpicJosch/MurderMystery

Browse files

# Conflicts:
#	build.gradle.kts
#	src/main/resources/plugin.yml

Loading branch information

EpicJosch committed Apr 23, 2024

2 parents ef32729 + 59fd93b commit 6dad783