Alex Gleason 62bf6d67e3 Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes		2021-07-18 11:49:22 -05:00
..
controllers	Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes	2021-07-18 11:49:22 -05:00
views	Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes	2021-07-18 11:49:22 -05:00
masto_fe_controller_test.exs	Verify MastoFE Controller put_settings response	2021-03-15 06:47:06 +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