Merge branch 'develop' into stable

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index f9de4ed49fac9e4922473f391fe2237cbe6f6ef0..8821d8ce106287131f48d61fb323aef91b346956 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # App artifacts
 docs/site
+*.zip
 *.sw*
 secret
 /_build
@@ -72,6 +73,8 @@ pleroma.iml
 
 # Generated documentation
 docs/site
+docs/venv
 
 # docker stuff
 docker-db
+*.iml