1
0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 15:15:08 +01:00
mastodon/app/presenters
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
2018-08-10 16:22:31 +02:00
..
activitypub Better pagination for ActivityPub outbox () 2018-05-04 19:19:11 +02:00
account_relationships_presenter.rb Public profile endorsements (accounts picked by profile owner) () 2018-08-09 09:56:53 +02:00
initial_state_presenter.rb Add protocol handler. Handle follow intents () 2017-08-14 04:53:31 +02:00
instance_presenter.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 22:20:25 +02:00
status_relationships_presenter.rb Add backend support for bookmarks 2018-04-11 20:40:29 +02:00