Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications ... # Conflicts: # CHANGELOG.md		2020-04-17 16:23:58 +03:00
..
account_view.ex	Merge branch 'develop' into features/remove-user-source_data	2020-04-16 21:28:52 +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	Update Copyrights	2020-03-03 16:44:49 -06:00
instance_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
list_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
marker_view.ex	Revert "Merge branch 'issue/1276' into 'develop'"	2020-04-14 16:32:22 +00:00
notification_view.ex	Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications	2020-04-17 16:23:58 +03:00
poll_view.ex	Bump copyright years of files changed after 2020-01-07	2020-03-02 06:08:45 +01:00
push_subscription_view.ex	Update Copyrights	2020-03-03 16:44:49 -06: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	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses	2020-04-02 19:38:39 +03:00