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 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		4 years ago
..
activitypub	Fix media not being marked sensitive when outgoing CW is set	4 years ago
nodeinfo	…
rest	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
rss	…
web	…
initial_state_serializer.rb	…
manifest_serializer.rb	Add app shortcuts (#15234)	4 years ago
oembed_serializer.rb	…
webfinger_serializer.rb	…