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

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9f12165749808c8188894358ccb3013548fac767..66d1376c53f173e3c5af516b9615cdcd839218f7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ secret
 /*.ez
 /test/uploads
 /.elixir_ls
+/test/fixtures/DSCN0010_tmp.jpg
 /test/fixtures/test_tmp.txt
 /test/fixtures/image_tmp.jpg
 /test/tmp/
@@ -39,7 +40,14 @@ erl_crash.dump
 
 # Prevent committing docs files
 /priv/static/doc/*
+docs/generated_config.md
 
 # Code test coverage
 /cover
 /Elixir.*.coverdata
+
+.idea
+pleroma.iml
+
+# asdf
+.tool-versions