Ivan Tashkinov 694d98be55 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework		2021-01-25 21:24:07 +03:00
..
controllers	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-25 09:45:06 -06:00
views	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-01-25 21:24:07 +03:00
masto_fe_controller_test.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01: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