Merge branch 'gitignore' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 24 Feb 2021 18:32:55 +0000 (18:32 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 24 Feb 2021 18:32:55 +0000 (18:32 +0000)
commit6b6791f911748b9881ae1c569f24259cdf11a2b3
tree64fd4c986f2962531b0ef7287de9b20b03082bad
parent870f9cb80ca2f28494f8bc677c9f757ed92825c7
parent978627c5e1775dfd61efe5986efb104a4e87887f
Merge branch 'gitignore' into 'develop'

gitignore: Vi and emacs temp files

See merge request pleroma/pleroma!3345