Merge branch 'develop' into 'public-polls'

Browse source

# Conflicts:
#   docs/development/API/differences_in_mastoapi_responses.md

...

This commit is contained in:

Haelwenn 2024-01-21 12:03:29 +00:00

parent a5f64ffd0c 548434f85c

commit ab3f03a04a

482 changed files with 4326 additions and 1430 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

test/fixtures/png_with_transparency.png vendored Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 82 KiB