Haelwenn 6b3842cf50 Merge branch 'remove/mastofe' into 'develop' ... Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392		2021-09-07 16:41:53 +00:00
..
controllers	Merge branch 'remove/mastofe' into 'develop'	2021-09-07 16:41:53 +00:00
views	Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes	2021-07-18 11:49:22 -05: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-16 00:51:04 -05:00