commit: 6b6791f911748b9881ae1c569f24259cdf11a2b3
parent 870f9cb80ca2f28494f8bc677c9f757ed92825c7
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Wed, 24 Feb 2021 18:32:55 +0000
Merge branch 'gitignore' into 'develop'
gitignore: Vi and emacs temp files
See merge request pleroma/pleroma!3345
Diffstat:
1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,7 @@ pleroma.iml
# asdf
.tool-versions
+
+# Editor temp files
+/*~
+/*#
+\ No newline at end of file