Merge branch 'develop' into merge/2025-03-24

Browse Source

# Conflicts:
#	CONTRIBUTING.md
#	packages/backend/src/core/activitypub/models/ApPersonService.ts

...

This commit is contained in:

Hazelnoot

2025-04-24 13:07:41 -04:00

parent 1612f2462f 92a4cf2dff

commit ac894986f9

8 changed files with 52 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/sharkey.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 464 KiB