Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex		2019-12-04 18:56:31 +03:00
..
account_view.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
app_view.ex	…
conversation_view.ex	format the code	2019-11-14 17:26:59 +03: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	Add a view for the move notification	2019-11-27 17:52:02 +07: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	Add `direct_conversation_id` to web push payload	2019-11-26 19:53:43 +07:00