Merge branch 'develop' into 'domain-block-precedence'

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9591f997639479396f5c5e458e561cdc15b841a2..3b0c7d3614100edebfe6b28a607599e70d58daab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,12 @@ erl_crash.dump
 
 # Prevent committing docs files
 /priv/static/doc/*
+docs/generated_config.md
 
 # Code test coverage
 /cover
 /Elixir.*.coverdata
+
+.idea
+pleroma.iml
+