You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		1 year ago
..
activitypub	Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	1 year ago
nodeinfo	Fix nodeinfo metadata attribute being an array instead of an object (#20114)	2 years ago
rest	Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	1 year ago
web	Update dependency rubocop-rails to v2.20.1 (#25493)	1 year ago
initial_state_serializer.rb	Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream	1 year ago
manifest_serializer.rb	Change PWA start URL from `/home` to `/` (#27377)	1 year ago
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	5 years ago
webfinger_serializer.rb	Add avatar image to webfinger responses (#26558)	1 year ago