You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md		5 years ago
..
token	OAuth token cleanup: Get rid of compile-time configuration	5 years ago
app.ex	tests for mastodon_api_controller.ex	5 years ago
authorization.ex	Replace `Pleroma.FlakeId` with `flake_id` hex package	5 years ago
fallback_controller.ex	Wrap error messages into gettext helpers	5 years ago
oauth_controller.ex	[#1427] Initial support for OAuth admin scopes.	5 years ago
oauth_view.ex	[#923] OAuth: prototype of sign in / sign up with Twitter.	6 years ago
scopes.ex	[#1427] Reworked admin scopes support.	5 years ago
token.ex	Replace `Pleroma.FlakeId` with `flake_id` hex package	5 years ago