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

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

diff --git a/.gitignore b/.gitignore
index 0bcbabb8c585339c0b8e197605a04b12e7c13b18..8fd762fa8abccbc5bafac85d246e88de829dc483 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ web/bundles/*
 !web/bundles/wallabagcore
 /web/assets/images/*
 !web/assets/images/.gitkeep
+web/bundles/wallabagcore/*.dev.js
 
 # Build
 /app/build
@@ -55,3 +56,4 @@ app/Resources/build/
 # Test-generated files
 admin-export.json
 specialexport.json
+/data/site-credentials-secret-key.txt