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

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index d1d7977f11d2ed0dc22f0748aed8f069a543915f..cb1ba45a8e6d8108ee56a82e0176cc8145c09e55 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,11 +29,12 @@ erl_crash.dump
 # variables.
 /config/*.secret.exs
 /config/generated_config.exs
+/config/runtime.exs
 /config/*.env
 
 
 # Database setup file, some may forget to delete it
-/config/setup_db.psql
+/config/setup_db*.psql
 
 .DS_Store
 .env
@@ -54,3 +55,7 @@ pleroma.iml
 
 # asdf
 .tool-versions
+
+# Editor temp files
+/*~
+/*#