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

[akkoma] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4dea75e9333aa49659c5676174e64a4ea4949962..08ef8999b821ae168e1b71a711ebfe709ceac256 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 # App artifacts
+secret
 /_build
 /db
 /deps
@@ -53,3 +54,7 @@ pleroma.iml
 
 # asdf
 .tool-versions
+
+# Editor temp files
+/*~
+/*#
\ No newline at end of file