Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.

2023-09-21 15:12:00 +02:00

..

activitypub

Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream

2023-09-02 11:41:40 +02:00

nodeinfo

Fix nodeinfo metadata attribute being an array instead of an object (#20114)

2022-11-08 17:26:11 +01:00

rest

Merge branch 'main' into glitch-soc/merge-upstream

2023-09-21 15:12:00 +02:00

web

Update dependency rubocop-rails to v2.20.1 (#25493)

2023-07-13 11:44:02 +02:00

initial_state_serializer.rb

Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream

2023-09-15 21:25:05 +02:00

manifest_serializer.rb

Add maskable icon support for Android (#20904)

2022-11-17 10:52:30 +01:00

oembed_serializer.rb

…

webfinger_serializer.rb

Add avatar image to webfinger responses (#26558)

2023-08-31 13:46:27 +02:00