lain 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop' ... AccountController: Return scope in proper format. Closes #1723 See merge request pleroma/pleroma!2694		2020-07-09 13:10:05 +00:00
..
controllers	Merge branch '1723-token-fixes' into 'develop'	2020-07-09 13:10:05 +00:00
views	Merge branch 'features/favicons' into 'develop'	2020-07-09 13:09:31 +00:00
mastodon_api_controller_test.exs
mastodon_api_test.exs	CommonAPI: Switch to pipeline for following.	2020-07-08 15:40:56 +02:00