diff options
| author | Lain Soykaf <lain@lain.com> | 2024-05-27 20:03:14 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-05-27 20:03:14 +0400 |
| commit | f4c0a01f097ec9d6d61dff3abfcda616b23e01e6 (patch) | |
| tree | e821106c60e3180005be5add7a18dbe569171a74 /.gitignore | |
| parent | 197647a04e66c1af3ae691a4507612fdbee9c48c (diff) | |
| parent | 7798fdc71121459f479e0729fefdac195b1dca7d (diff) | |
| download | pleroma-f4c0a01f097ec9d6d61dff3abfcda616b23e01e6.tar.gz pleroma-f4c0a01f097ec9d6d61dff3abfcda616b23e01e6.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into image-description-summary
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
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 |