Alex Gleason f2134e605b Merge remote-tracking branch 'pleroma/develop' into cycles-base-url		2021-05-31 16:49:46 -05:00
..
controllers	Merge remote-tracking branch 'pleroma/develop' into cycles-base-url	2021-05-31 16:49:46 -05:00
views	Merge remote-tracking branch 'pleroma/develop' into cycles-base-url	2021-05-31 16:49:46 -05: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