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

[jirafeau.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c1bcf70882243f6bcc0332993bcfbee527724764..c911a76c9cc6388f3b930ad481fa65f4fe1cd7cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,12 @@ lib/tos.local.txt
 media/custom/
 var-*
 *._*
 media/custom/
 var-*
 *._*

+composer.phar

 /vendor
 .idea/
 /vendor
 .idea/

+
+# Ignore file starting with dot, but keep others
+.*
+!.gitlab-ci.yml
+!.gitignore
+!.dockerignore
\ No newline at end of file