Merge branch '2.5'

ezsystems · Jul 4, 2019 · 949c5c3 · 949c5c3
2 parents ec3aa53 + 8794e1c
commit 949c5c3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -36,7 +36,6 @@
 !/var/encore
 /var/encore/*
 !var/encore/.gitkeep
-!var/SymfonyRequirements.php
 /vendor/
 /public/bundles/
 /public/assets/translations/*
@@ -45,6 +44,11 @@
 /public/assets/ezplatform/build/*
 !/public/assets/ezplatform/build/.gitkeep
 /node_modules/
+/bin/*
+!bin/.ci/
+!bin/.travis/
+!bin/console
+!bin/vhost.sh
 
 .php~