Merge branch 'beta' into dev

This commit is contained in:
Edward Firmo
2023-09-07 22:47:22 +02:00
committed by GitHub
2 changed files with 5 additions and 1 deletions

4
.gitignore vendored
View File

@@ -1,6 +1,10 @@
# Ignore Mac DS_Store files
.DS_Store
**/.DS_Store
Nextion2Text.*
*.cmd
*.bat
# Ignore IntelliJ IDEA project directory
.idea