akkoma/test/pleroma/web/mastodon_api
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
..
controllers Merge branch 'remove-conversation-api' into 'develop' 2021-02-17 15:14:27 +00:00
views Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-02-16 23:23:49 +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