Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitignore
#	gradlew
This commit is contained in:
2024-01-14 13:28:43 +01:00
+1 -1
View File
@@ -1,5 +1,5 @@
.gradle/
.idea/
.gradle
run
build
run.sh