mastodon/app/presenters
Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00
..
activitypub Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
account_relationships_presenter.rb Hide blocking accounts from blocked users (#10442) 2019-04-01 20:06: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-03-26 16:01:59 +01:00
status_relationships_presenter.rb Add backend support for bookmarks 2018-04-11 20:40:29 +02:00