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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
v2	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
web	Fix web push notifications for polls (#10864)	6 years ago
base_controller.rb	Fix uncaught parameter missing exceptions and missing error templates (#11702)	5 years ago
oembed_controller.rb	…
proofs_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	6 years ago