X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=.gitignore;h=49ff72c6d6d3b7e38beb780b456f2ba4f5fe9d60;hb=6546aca4a3a54ec61c3b43e84aa948efb1aeca95;hp=8fd762fa8abccbc5bafac85d246e88de829dc483;hpb=42708d1121fef12c84487247b170eb03083d5ffc;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 8fd762fa..49ff72c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /bin/*
 !/bin/console
 !/bin/symfony_requirements
+.php_cs.cache
 
 # Parameters
 /app/config/parameters.yml
@@ -22,12 +23,11 @@
 
 # Assets and user uploads
 web/uploads/
-!web/bundles
-web/bundles/*
-!web/bundles/wallabagcore
+/web/bundles/*
+!/web/bundles/.gitkeep
 /web/assets/images/*
 !web/assets/images/.gitkeep
-web/bundles/wallabagcore/*.dev.js
+/web/wallassets/*.dev.js
 
 # Build
 /app/build
@@ -43,9 +43,6 @@ data/db/wallabag*.sqlite
 docker/logs/
 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/
 bin