Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3b0c7d3614100edebfe6b28a607599e70d58daab..62ca61bce780d92f3ffdbb71093d76a40488b025 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,10 @@
 /db
 /deps
 /*.ez
+/test/instance
 /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
@@ -47,3 +51,5 @@ docs/generated_config.md
 .idea
 pleroma.iml
 
+# asdf
+.tool-versions