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

# Conflicts:
#	Pack/MKWFaraphel/mod_config.json
This commit is contained in:
Faraphel 2023-01-17 15:40:34 +01:00
commit 773a55cf9e

View file

@ -6099,7 +6099,7 @@
"version": "v1.0.1", "version": "v1.0.1",
"since_version": "0.11", "since_version": "0.11",
"score": 5, "score": 5,
"tags": ["Sonic"] "tags": ["Sonic"],
}, },
{ {
"name": "Emerald Isle", "name": "Emerald Isle",