9 commits

Author	SHA1	Message	Date
lain	1ed8fbc4d9	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 15:10:57 +02:00
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" ... This reverts merge request !1737	2019-10-05 10:00:05 +00:00
lain	d9aaea44ff	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 10:42:29 +02:00
eugenijm	06d9df79c5	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-04 00:53:23 +03:00
lain	4cb603e1df	PleromaAPI: Add unreacting.	2019-10-02 18:19:16 +02:00
lain	557223b2b5	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-02 13:27:55 +02:00
Egor Kislitsyn	3c5ecb70b4	Add PleromaAPI.AccountController	2019-09-30 19:10:55 +07:00
rinpatch	e9d1aa75d5	Revert subscription refactoring. ... As discussed in pleroma-meta#2 This reverts commit eb9aa7aa10, reversing changes made to c4fbb56984.	2019-09-29 18:43:27 +03:00
Roman Chvanikov	e9f69a3eb7	Move pleroma_api controllers into controllers sub-folders	2019-09-17 16:52:23 +03:00

Renamed from test/web/pleroma_api/pleroma_api_controller_test.exs (Browse further)