Ivan Tashkinov 8f88a90ca3 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex		2021-02-23 13:58:35 +03:00
..
account_view.ex	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).	2021-01-28 19:49:43 +03:00
app_view.ex	[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.	2021-02-11 15:02:50 +03: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	Add active user count	2021-01-27 18:20:06 +04: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