diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-04-24 13:07:41 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-04-24 13:07:41 -0400 |
| commit | ac894986f97888829badb39c6a8b33d0ecf0721c (patch) | |
| tree | b64de6d0529bd66119713050b7e5812eb0651af3 /assets | |
| parent | merge: fix/revert some defaults back to sharkey defaults (!967) (diff) | |
| parent | merge: Fix typo in contributing. (!965) (diff) | |
| download | sharkey-ac894986f97888829badb39c6a8b33d0ecf0721c.tar.gz sharkey-ac894986f97888829badb39c6a8b33d0ecf0721c.tar.bz2 sharkey-ac894986f97888829badb39c6a8b33d0ecf0721c.zip | |
Merge branch 'develop' into merge/2025-03-24
# Conflicts:
# CONTRIBUTING.md
# packages/backend/src/core/activitypub/models/ApPersonService.ts
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/sharkey.webp | bin | 0 -> 475316 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/assets/sharkey.webp b/assets/sharkey.webp Binary files differnew file mode 100644 index 0000000000..2ea900068c --- /dev/null +++ b/assets/sharkey.webp |
