Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	config/locales/simple_form.ja.yml

1 files changed, 3 insertions, 1 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 8fe592ee8..93f870ce7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,7 +14,9 @@ Rails.application.routes.draw do
   end
 
   use_doorkeeper do
-    controllers authorizations: 'oauth/authorizations', authorized_applications: 'oauth/authorized_applications'
+    controllers authorizations: 'oauth/authorizations',
+                authorized_applications: 'oauth/authorized_applications',
+                tokens: 'oauth/tokens'
   end
 
   get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' }