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 a96375d2ef 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
..
credentials_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
follower_accounts_controller_spec.rb	Improve blocked view of profiles (#10491)	6 years ago
following_accounts_controller_spec.rb	Improve blocked view of profiles (#10491)	6 years ago
lists_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
pins_controller_spec.rb	Add specs for Accounts::PinsController (#9542)	6 years ago
relationships_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
search_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
statuses_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago