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 f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.		6 years ago
..
bookmarks_controller.rb	Introduce OAuth scopes for bookmarks	6 years ago
favourited_by_accounts_controller.rb	Improve blocked view of profiles (#10491)	6 years ago
favourites_controller.rb	Add more granular OAuth scopes (#7929)	7 years ago
mutes_controller.rb	Add more granular OAuth scopes (#7929)	7 years ago
pins_controller.rb	Add more granular OAuth scopes (#7929)	7 years ago
reblogged_by_accounts_controller.rb	Improve blocked view of profiles (#10491)	6 years ago
reblogs_controller.rb	Add `visibility` param to reblog REST API (#9851)	6 years ago