Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 198e801399757dda814145f3458d194f88bb363d..b62891f264fe4bdcfeea2c94addd2d4a4038648f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
 # App artifacts
+secret
 /_build
 /db
 /deps
 /*.ez
 /test/uploads
 /.elixir_ls
+/test/fixtures/DSCN0010_tmp.jpg
 /test/fixtures/test_tmp.txt
 /test/fixtures/image_tmp.jpg
 /test/tmp/
@@ -26,6 +28,8 @@ erl_crash.dump
 # variables.
 /config/*.secret.exs
 /config/generated_config.exs
+/config/*.env
+
 
 # Database setup file, some may forget to delete it
 /config/setup_db.psql