4 commits

Author	SHA1	Message	Date
Haelwenn (lanodan) Monnier	5c533e10e7	Bump credo to 1.1.5	2020-01-20 12:17:14 +01:00
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
Ivan Tashkinov	e6f43a831b	[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).	2019-09-15 18:22:08 +03:00
Egor Kislitsyn	4194abbc8f	Move mastodon_api/*_controller.ex to mastodon_api/controllers/	2019-08-26 19:37:57 +07:00

Renamed from lib/pleroma/web/mastodon_api/subscription_controller.ex (Browse further)