Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream ...

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README

2023-08-11 22:15:41 +02:00

..

activitypub

Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream

2023-07-30 13:49:35 +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 commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream

2023-07-30 16:11:55 +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 '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

2023-08-11 22:15:41 +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

Change interaction modal in web UI (#26075)

2023-07-27 16:11:17 +02:00