Merge branch 'multi-http-admins' into next-release

[jirafeau.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index cbcc532ebf489b0625b33760cb338f5e08d268ef..c911a76c9cc6388f3b930ad481fa65f4fe1cd7cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,12 @@ lib/tos.local.txt
 media/custom/
 var-*
 *._*
-/vendor
\ No newline at end of file
+composer.phar
+/vendor
+.idea/
+
+# Ignore file starting with dot, but keep others
+.*
+!.gitlab-ci.yml
+!.gitignore
+!.dockerignore
\ No newline at end of file