Merge branch 'main' into 'server'

[rbdr/junction] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0ac92e135066f40b9cf769404132837351fad1f8..9765d1ce39ab3d6c06f5819bffb164edcd7bdab4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .idea
-.DS_Store
 node_modules
+.DS_Store