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
..
controllers	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	2020-04-01 20:08:14 +03:00
views	[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.	2020-04-02 19:23:30 +03:00
mastodon_api_controller_test.exs	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
mastodon_api_test.exs	Update Copyrights	2020-03-03 16:44:49 -06:00