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

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's

2019-11-07 13:43:56 +01:00

..

activitypub

Improved remote thread fetching (#10106)

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

account_relationships_presenter.rb

Fix relationship caches being broken as result of a follow request (#12299)

2019-11-07 09:08:00 +02: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-10-03 11:10:12 +02:00

status_relationships_presenter.rb

Add backend support for bookmarks

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