summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-02-24 18:32:55 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-02-24 18:32:55 +0000
commit6b6791f911748b9881ae1c569f24259cdf11a2b3 (patch)
tree64fd4c986f2962531b0ef7287de9b20b03082bad
parent870f9cb80ca2f28494f8bc677c9f757ed92825c7 (diff)
parent978627c5e1775dfd61efe5986efb104a4e87887f (diff)
Merge branch 'gitignore' into 'develop'
gitignore: Vi and emacs temp files See merge request pleroma/pleroma!3345
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4dea75e93..f30f4cf5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,7 @@ pleroma.iml
# asdf
.tool-versions
+
+# Editor temp files
+/*~
+/*# \ No newline at end of file