lain e2772d6bf1 Merge branch 'block-behavior' into 'develop' ... Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242		2021-11-15 14:27:59 +00:00
..
controllers	Merge branch 'block-behavior' into 'develop'	2021-11-15 14:27:59 +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	CI: Bump lint stage to elixir-1.12	2021-10-06 08:11:05 +02:00