Merge branch 'develop' into stable

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index cb1ba45a8e6d8108ee56a82e0176cc8145c09e55..8821d8ce106287131f48d61fb323aef91b346956 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 # App artifacts
+docs/site
+*.zip
+*.sw*
 secret
 /_build
 /db
@@ -14,6 +17,14 @@ secret
 /doc
 /instance
 /priv/ssh_keys
+vm.args
+.cache/
+.hex/
+.mix/
+.psql_history
+docker-resources/Dockerfile
+docker-resources/Caddyfile
+pgdata
 
 # Prevent committing custom emojis
 /priv/static/emoji/custom/*
@@ -59,3 +70,11 @@ pleroma.iml
 # Editor temp files
 /*~
 /*#
+
+# Generated documentation
+docs/site
+docs/venv
+
+# docker stuff
+docker-db
+*.iml