Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream ...

No conflicts.

2019-01-19 18:28:37 +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

…

mutes_controller.rb

…

pins_controller.rb

…

reblogged_by_accounts_controller.rb

Fix REST API showing non-public reblogs for a given status (#9850)

2019-01-18 20:58:00 +01:00

reblogs_controller.rb

…