kaniini 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop' ... Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737		2019-10-04 17:33:18 +00:00
..
activity_pub	ActivityPub.Utils: Fix undo test.	2019-10-04 17:10:49 +02:00
admin_api	Fix merge	2019-09-30 19:10:54 +07:00
auth
common_api	Add tests for privately announcing statuses via API	2019-10-01 20:38:29 +02:00
instances
mastodon_api	Merge branch 'user-info-unread-direct-conversation' into 'develop'	2019-10-04 17:33:18 +00:00
media_proxy
metadata
mongooseim
oauth	Send an identifier alongside with error message in OAuthController	2019-10-01 18:10:04 +03:00
ostatus	Merge branch 'features/apc2s-media-upload' into 'develop'	2019-09-30 11:21:49 +00:00
pleroma_api/controllers	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-04 00:53:23 +03:00
plugs
push
rich_media
salmon
streamer
twitter_api	Fix merge	2019-09-30 19:10:54 +07:00
views
web_finger
websub
fallback_test.exs
federator_test.exs
masto_fe_controller_test.exs	Fix credo warning	2019-10-02 21:12:01 +07:00
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs