Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex		2019-10-23 17:22:42 +03:00
..
account_view.ex	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
app_view.ex	…
conversation_view.ex	Fix merge	2019-09-30 19:10:54 +07:00
custom_emoji_view.ex	Add CustomEmojiController	2019-10-02 19:16:34 +07:00
filter_view.ex	…
instance_view.ex	Extract instance actions from `MastodonAPIController` to `InstanceController`	2019-10-02 14:13:52 +07:00
list_view.ex	…
marker_view.ex	add Markers /api/v1/markers	2019-10-17 15:26:59 +03:00
notification_view.ex	notification_view.ex: Make sure `account` isn’t empty	2019-10-04 07:11:53 +02:00
poll_view.ex	Extract poll actions from `MastodonAPIController` to `PollController`	2019-10-01 11:44:34 +07:00
push_subscription_view.ex	…
report_view.ex	Extract report actions from `MastodonAPIController` to `ReportController`	2019-09-30 17:44:10 +07:00
scheduled_activity_view.ex	Cleanup ScheduledActivityView	2019-09-27 13:36:28 +07:00
status_view.ex	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00