X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=0bcbabb8c585339c0b8e197605a04b12e7c13b18;hb=ab9eb5cdb767510c0c2b9d1b114243741f748f89;hp=3b2dc462f6a12f63173bda028a5851e7ed5051eb;hpb=ab809de18415a9ce3bbc95d3a0a1af6c50a41c4f;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 3b2dc462..0bcbabb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,12 @@
 /vendor/
 
 # Assets and user uploads
-/web/bundles/
-/web/uploads/
+web/uploads/
+!web/bundles
+web/bundles/*
+!web/bundles/wallabagcore
+/web/assets/images/*
+!web/assets/images/.gitkeep
 
 # Build
 /app/build
@@ -32,7 +36,6 @@
 /composer.phar
 
 # Data for wallabag
-data/assets/*
 data/db/wallabag*.sqlite
 
 # Docker container logs and data
@@ -43,9 +46,12 @@ docker/data/
 composer.lock
 
 # assets stuff
-/node_modules/
-!app/Resources/static/lib
-app/Resources/static/lib/*
-/bin
+node_modules/
+bin
+app/Resources/build/
 !/src/Wallabag/CoreBundle/Resources/public
-/src/Wallabag/CoreBundle/Resources/public/*
\ No newline at end of file
+/src/Wallabag/CoreBundle/Resources/public/*
+
+# Test-generated files
+admin-export.json
+specialexport.json