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.

2019-04-08 15:57:56 +02:00

..

bookmarks_controller.rb

Introduce OAuth scopes for bookmarks

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

favourited_by_accounts_controller.rb

Improve blocked view of profiles (#10491)

2019-04-07 04:59:13 +02: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

Improve blocked view of profiles (#10491)

2019-04-07 04:59:13 +02:00

reblogs_controller.rb

Add visibility param to reblog REST API (#9851)

2019-03-15 04:36:41 +01:00