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

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4e71a7df0d37346ed4381f6f203e7a6163f2851e..2fce38981d3f28c03bca071b7692c986a9a19b36 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 # App artifacts
+secret
 /_build
 /db
 /deps
@@ -43,3 +44,7 @@ docs/generated_config.md
 # Code test coverage
 /cover
 /Elixir.*.coverdata
+
+.idea
+pleroma.iml
+