diff options
| author | feld <feld@feld.me> | 2024-02-12 22:23:31 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-02-12 22:23:31 +0000 |
| commit | 79d69ce72a4a922d1be8f3aae36d5fff3089fd1c (patch) | |
| tree | 4e958306b00b850153d6308a9bcfe343a83d27d7 | |
| parent | 769e02d0de48484d9396fadb030bf5f708f4fd84 (diff) | |
| parent | 67c3acde34bf92e033b9c65b210e3f6fb3e97778 (diff) | |
| download | pleroma-79d69ce72a4a922d1be8f3aae36d5fff3089fd1c.tar.gz pleroma-79d69ce72a4a922d1be8f3aae36d5fff3089fd1c.zip | |
Merge branch 'gitignore' into 'develop'
Update .gitignore
See merge request pleroma/pleroma!4059
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | changelog.d/.search_config.fix.swp | bin | 12288 -> 0 bytes |
2 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 diff --git a/changelog.d/.search_config.fix.swp b/changelog.d/.search_config.fix.swp Binary files differdeleted file mode 100644 index e310fa87e..000000000 --- a/changelog.d/.search_config.fix.swp +++ /dev/null |