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 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
bookmarks_controller.rb	Introduce OAuth scopes for bookmarks	6 years ago
favourited_by_accounts_controller.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
favourites_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
mutes_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
pins_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago
reblogged_by_accounts_controller.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
reblogs_controller.rb	Add more granular OAuth scopes (#7929)	6 years ago