summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-02-12 22:23:31 +0000
committerfeld <feld@feld.me>2024-02-12 22:23:31 +0000
commit79d69ce72a4a922d1be8f3aae36d5fff3089fd1c (patch)
tree4e958306b00b850153d6308a9bcfe343a83d27d7 /.gitignore
parent769e02d0de48484d9396fadb030bf5f708f4fd84 (diff)
parent67c3acde34bf92e033b9c65b210e3f6fb3e97778 (diff)
downloadpleroma-79d69ce72a4a922d1be8f3aae36d5fff3089fd1c.tar.gz
pleroma-79d69ce72a4a922d1be8f3aae36d5fff3089fd1c.zip
Merge branch 'gitignore' into 'develop'
Update .gitignore See merge request pleroma/pleroma!4059
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 4009bd844..3b672184e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,5 +57,6 @@ pleroma.iml
.tool-versions
# Editor temp files
-/*~
-/*#
+*~
+*#
+*.swp