Ivan Tashkinov 4e14945670 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ...

# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/activity_pub/activity_pub.ex

2021-02-03 09:31:38 +03:00

..

account_view_test.exs

Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).

2021-01-28 19:49:43 +03:00

conversation_view_test.exs

Bump Copyright to 2021

2021-01-13 07:49:50 +01:00

list_view_test.exs

Bump Copyright to 2021

2021-01-13 07:49:50 +01:00

marker_view_test.exs

Bump Copyright to 2021

2021-01-13 07:49:50 +01:00

notification_view_test.exs

Bump Copyright to 2021

2021-01-13 07:49:50 +01:00

poll_view_test.exs

little refactor and tests

2021-01-25 19:46:36 +03:00

scheduled_activity_view_test.exs

Bump Copyright to 2021

2021-01-13 07:49:50 +01:00

status_view_test.exs

Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

2021-01-22 10:05:28 +03:00

subscription_view_test.exs

Bump Copyright to 2021

2021-01-13 07:49:50 +01:00