Merge remote-tracking branch 'upstream/master'

[github/shaarli/Shaarli.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3f6939a41503144d044b55dce89a646738b40de4..170030ee66d9c827fe53be6ab1068b7eade6fad8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,11 @@ pagecache
 .buildpath
 .project
 
+# macOS General
+.DS_Store
+.AppleDouble
+.LSOverride
+
 # Raintpl generated pages
 *.rtpl.php
 
@@ -36,3 +41,13 @@ doc/html/
 tpl/*
 !tpl/default
 !tpl/vintage
+
+# Front end
+node_modules
+tpl/default/js
+tpl/default/css
+tpl/default/fonts
+tpl/default/img
+tpl/vintage/js
+tpl/vintage/css
+tpl/vintage/img