diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-24 18:32:55 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-24 18:32:55 +0000 |
commit | 6b6791f911748b9881ae1c569f24259cdf11a2b3 (patch) | |
tree | 64fd4c986f2962531b0ef7287de9b20b03082bad | |
parent | 870f9cb80ca2f28494f8bc677c9f757ed92825c7 (diff) | |
parent | 978627c5e1775dfd61efe5986efb104a4e87887f (diff) | |
download | pleroma-6b6791f911748b9881ae1c569f24259cdf11a2b3.tar.gz pleroma-6b6791f911748b9881ae1c569f24259cdf11a2b3.zip |
Merge branch 'gitignore' into 'develop'
gitignore: Vi and emacs temp files
See merge request pleroma/pleroma!3345
-rw-r--r-- | .gitignore | 4 |
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 |