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 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.		1 year ago
..
activitypub	Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' 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 '3554c527954441fd924586a49c7d99a89101ac7e' 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 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream	1 year ago
manifest_serializer.rb	Add maskable icon support for Android (#20904)	2 years ago
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	5 years ago
webfinger_serializer.rb	Change interaction modal in web UI (#26075)	1 year ago