Haelwenn 1262357ddb Merge branch 'cancel-follow-request' into 'develop' ... Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175		2020-02-07 16:10:43 +00:00
..
controllers	Merge branch 'cancel-follow-request' into 'develop'	2020-02-07 16:10:43 +00:00
views	EmojiReactions: Rename to EmojiReacts	2020-02-06 18:09:57 +01:00
mastodon_api_controller_test.exs	[#2068] Introduced proper OAuth tokens usage to controller tests.	2019-12-19 17:23:27 +03:00
mastodon_api_test.exs