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

Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml

2019-03-26 16:02:54 +01:00

..

activitypub

Improved remote thread fetching (#10106)

2019-02-28 15:22:21 +01:00

account_relationships_presenter.rb

Add blocked_by relationship to the REST API (#10373)

2019-03-26 01:24:09 +01:00

initial_state_presenter.rb

Add protocol handler. Handle follow intents (#4511)

2017-08-14 04:53:31 +02:00

instance_presenter.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-26 16:01:59 +01:00

status_relationships_presenter.rb

Add backend support for bookmarks

2018-04-11 20:40:29 +02:00