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 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		6 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
rest	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
rss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
web	Only display web push notifications after API call (fixes #7902) (#8396)	6 years ago
initial_state_serializer.rb	Add option to disable real-time updates in web UI (#9984)	6 years ago
manifest_serializer.rb	Improve config serializer for Keybase (#10338)	6 years ago
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	6 years ago
webfinger_serializer.rb	Add ActivityPub actor representing the entire server (#11321)	6 years ago