Sean King dc4814f0cd Fix merge conflicts with upstream		2021-06-04 14:42:44 -06:00
..
controllers	Fix merge conflicts with upstream	2021-06-04 14:42:44 -06: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	Remove no longer necessary unit tests for MastoFE	2021-04-15 23:12:42 -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	Remove MastoFE configuration stuff	2021-04-15 23:51:04 -06:00