Merge remote-tracking branch 'origin/master' into 2.1

[github/wallabag/wallabag.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f596c7b8fb9d6562ec0baa1a1b76f580308451ec..fb51034e28110d62921deddf00cbacaf6eb85358 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,11 @@ docker/data/
 
 # To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
 composer.lock
+
+# assets stuff
+/node_modules/
+!app/Resources/static/lib
+app/Resources/static/lib/*
+/bin
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*