Merge branch 'f_modularization_wip_rebased' into 'next-release'

[jirafeau.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c1bcf70882243f6bcc0332993bcfbee527724764..4c13bde9cd92aff8fce03d06c24d26dab14bea2c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,15 @@
 lib/config.local.php
 lib/tos.local.txt
 media/custom/
 lib/config.local.php
 lib/tos.local.txt
 media/custom/

+media/dark-custom/

 var-*
 *._*
 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