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

Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.

2019-10-03 11:10:12 +02:00

..

activitypub

Improved remote thread fetching (#10106)

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

account_relationships_presenter.rb

Improve blocked view of profiles (#10491)

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