Merge branch 'bug_admin_download_encrypted' into 'next-release'

[jirafeau_project.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f2a258ca74fdf455978e31e11f1fe1291f90272b..4c13bde9cd92aff8fce03d06c24d26dab14bea2c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 lib/config.local.php
 lib/tos.local.txt
 media/custom/
+media/dark-custom/
 var-*
 *._*
 composer.phar
@@ -10,4 +11,5 @@ composer.phar
 # Ignore file starting with dot, but keep others
 .*
 !.gitlab-ci.yml
-!.gitignore
\ No newline at end of file
+!.gitignore
+!.dockerignore
\ No newline at end of file