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		2019-07-23 10:51:07 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
rss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
web	Only display web push notifications after API call (fixes #7902) (#8396)	2018-08-23 21:44:27 +02:00
initial_state_serializer.rb	Add option to disable real-time updates in web UI (#9984)	2019-07-16 16:11:50 +02:00
manifest_serializer.rb	Improve config serializer for Keybase (#10338)	2019-03-21 23:33:28 +01:00
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	2019-03-25 15:01:09 +01:00
webfinger_serializer.rb	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00