Thibaut Girka f8e07ca5cd 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).

2018-11-27 13:23:02 +01:00

..

bookmarks_controller.rb

Introduce OAuth scopes for bookmarks

2018-08-10 16:49:06 +02:00

favourited_by_accounts_controller.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

favourites_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

mutes_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

pins_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

reblogged_by_accounts_controller.rb

Extract counters from accounts table to account_stats table (#9295)

2018-11-19 00:43:52 +01:00

reblogs_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00