Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex		2020-07-02 16:36:54 +03:00
..
account_view.ex	Merge branch 'feature/1739-account-endpoints' into 'develop'	2020-06-22 12:37:10 +00:00
app_view.ex	Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})	2020-06-05 14:48:02 +00:00
conversation_view.ex	Conversations: Return last dm for conversation, not last message.	2020-06-15 12:27:13 +02: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	Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'	2020-06-23 16:38:27 +00: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	Add is_muted to notifications	2020-06-22 19:03:04 +04: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	Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})	2020-06-05 14:48:02 +00:00
status_view.ex	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-02 16:36:54 +03:00
subscription_view.ex	Cleanup SubscriptionController	2020-04-15 23:14:47 +04:00