Merge remote-tracking branch 'upstream/develop' into registration-workflow

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3b0c7d3614100edebfe6b28a607599e70d58daab..6ae21e9144f410f289fc0734b714bfcbd7226aac 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /*.ez
 /test/uploads
 /.elixir_ls
+/test/fixtures/DSCN0010_tmp.jpg
 /test/fixtures/test_tmp.txt
 /test/fixtures/image_tmp.jpg
 /test/tmp/
@@ -26,6 +27,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 +50,5 @@ docs/generated_config.md
 .idea
 pleroma.iml
 
+# asdf
+.tool-versions