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

..

controllers

Merge branch 'develop' into 'fix/2411-mutes-api'

2021-02-02 17:57:58 +00:00

views

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

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

masto_fe_controller_test.exs

Convert tests to all use clear_config instead of Pleroma.Config.put

2021-01-26 11:58:43 -06:00

mastodon_api_controller_test.exs

Bump Copyright to 2021

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

mastodon_api_test.exs

Change user.deactivated field to user.is_active

2021-01-15 11:24:46 -06:00

update_credentials_test.exs

Bump Copyright to 2021

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