Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated its README, we have a completely different one. Kept ours. - `app/views/auth/sessions/two_factor.html.haml`: Upstream refactored stuff and the conflict is because of glitch-soc's theming system. Ported upstream changes while accounting for the different theming system.		2023-10-17 20:59:18 +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 commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +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	Change PWA start URL from `/home` to `/` (#27377)	2023-10-12 16:47:18 +02:00
oembed_serializer.rb	…
webfinger_serializer.rb	Add avatar image to webfinger responses (#26558)	2023-08-31 13:46:27 +02:00