Ivan Tashkinov 1b49b8efe5 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md		2021-01-31 20:38:58 +03:00
..
account_view.ex	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-18 14:58:21 -06:00
app_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
conversation_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
custom_emoji_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
filter_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
instance_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
list_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
marker_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
notification_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
poll_view.ex	Credo	2021-01-25 18:25:53 -06:00
report_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
scheduled_activity_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
status_view.ex	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-22 10:05:28 +03:00
subscription_view.ex	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00