Skip to content
Snippets Groups Projects
Commit dfef9890 authored by Gagafeee's avatar Gagafeee
Browse files

Merge branch 'main' into... 

Merge branch 'main' into (feature/2_formattage_texte_discord)-Gagafeee]-Coloration-syntaxique-MC-Discord

# Conflicts:
#	target/classes/com/slprojects/slcraftplugin/Main.class
#	target/maven-archiver/pom.properties
parents c6dfb592 343bb105
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment