2 Commits

Author	SHA1	Message	Date
Ivan Tashkinov	b93856874d	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	2019-10-06 17:12:17 +03:00
Egor Kislitsyn	36a34c36fe	Extract poll actions from MastodonAPIController to PollController	2019-10-01 11:44:34 +07:00