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.

Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml		5 years ago
..
activitypub	Revert "Remove conversation URI (#11423)" (#11424)	5 years ago
rest	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
rss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
web	…
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
manifest_serializer.rb	…
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	6 years ago
webfinger_serializer.rb	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	5 years ago