Ivan Tashkinov 218c519606 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # test/pleroma/web/mastodon_api/views/status_view_test.exs		2021-01-22 10:05:28 +03:00
..
account_view_test.exs	Change user.confirmation_pending field to user.is_confirmed	2021-01-15 12:44:41 -06:00
conversation_view_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
list_view_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
marker_view_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
notification_view_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
poll_view_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
scheduled_activity_view_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
status_view_test.exs	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-22 10:05:28 +03:00
subscription_view_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00