Merge branch 'develop' into stable

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 14373fb8c557f12924e3bc3b683fa61a9db12547..8821d8ce106287131f48d61fb323aef91b346956 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,8 @@ pleroma.iml
 
 # Generated documentation
 docs/site
+docs/venv
 
 # docker stuff
 docker-db
+*.iml