Ivan Tashkinov fd2fb2bb2e Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs		2020-05-13 12:42:36 +03:00
..
account_view.ex	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-13 12:42:36 +03:00
app_view.ex	creating trusted app from adminFE & mix task	2020-03-23 10:44:47 +03: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	Move single used schemas to Filter operation schema	2020-05-05 17:41:01 +04:00
instance_view.ex	InstanceController: Add extensions to /api/v1/instance	2020-04-27 14:28:08 +02:00
list_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
marker_view.ex	Merge branch 'develop' into issue/1276-2	2020-05-06 14:47:50 +03:00
notification_view.ex	[#2456] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.	2020-05-12 19:14:35 +03:00
poll_view.ex	Polls: Persist and show voters' count	2020-04-22 14:06:39 +02: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	[#2456] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.	2020-05-12 19:14:35 +03:00
subscription_view.ex	Cleanup SubscriptionController	2020-04-15 23:14:47 +04:00