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 ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code		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