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 579ccb0bb9 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		5 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
v2	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
web	Fix web push notifications for polls (#10864)	6 years ago
base_controller.rb	Change unconfirmed user login behaviour (#11375)	5 years ago
oembed_controller.rb	Update status embeds (#4742)	7 years ago
proofs_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	5 years ago