Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ... # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex		2020-04-02 19:38:39 +03:00
..
account_view.ex	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses	2020-04-02 19:38:39 +03:00
app_view.ex	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
conversation_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
custom_emoji_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
filter_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
instance_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
list_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
marker_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
notification_view.ex	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses	2020-04-02 19:38:39 +03:00
poll_view.ex	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
push_subscription_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
report_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
scheduled_activity_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
status_view.ex	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses	2020-04-02 19:38:39 +03:00