Merge branch 'develop'

# Conflicts:
#	.gitignore
This commit is contained in:
meysamhadeli 2023-01-15 18:10:14 +03:30
commit 00c678ef5c
2 changed files with 3 additions and 4 deletions

3
.gitignore vendored
View File

@ -433,3 +433,6 @@ fabric.properties
# Tye
.tye/
# CHANGELOG
CHANGELOG.md

View File

@ -1,4 +0,0 @@
# Changelog
All notable changes to this project will be documented in this file.