mastodon/app/presenters
Thibaut Girka fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
2019-03-26 16:01:59 +01:00
..
activitypub Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
account_relationships_presenter.rb Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +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