Merge branch 'dev' into 'master'

Merge branch 'feature/mac-gitignore' into dev
add mac files to gitignore
2023-06-23 04:48:02 +10:00 · 2023-06-23 04:47:44 +10:00 · 2023-06-22 20:12:46 +02:00
1 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,5 @@
 /target
 config.toml
 Cargo.lock
+.idea
+.DS_Store
Author	SHA1	Message	Date
froge	07284e2124	Merge branch 'dev' into 'master'	2023-06-23 04:48:02 +10:00
froge	7ef24ce48e	Merge branch 'feature/mac-gitignore' into dev	2023-06-23 04:47:44 +10:00
mackrab	f07897d08d	add mac files to gitignore	2023-06-22 20:12:46 +02:00