Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop' ... [#2069] unread_conversation_count See merge request pleroma/pleroma!2939		2020-10-29 23:39:15 +00:00
..
controllers	Merge branch 'issue/2069' into 'develop'	2020-10-29 23:39:15 +00:00
views	Merge branch 'feature/gen-magic' into 'develop'	2020-10-14 17:31:45 +00:00
masto_fe_controller_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
mastodon_api_controller_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
mastodon_api_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
update_credentials_test.exs	Undo API breaking changes	2020-10-14 11:03:17 -05:00