feld 8f9ee694ed Merge branch 'features/profile-fields-emojo' into 'develop' ... user: Add support for custom emojis in profile fields See merge request pleroma/pleroma!2741		2020-07-13 15:43:46 +00:00
..
controllers	Merge branch 'features/profile-fields-emojo' into 'develop'	2020-07-13 15:43:46 +00:00
views	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	2020-07-10 12:26:53 +02:00
mastodon_api_controller_test.exs	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	2020-04-24 16:52:38 +03:00
mastodon_api_test.exs	CommonAPI: Switch to pipeline for following.	2020-07-08 15:40:56 +02:00