diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-06-26 14:51:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-26 14:51:00 +0200 |
commit | db6361ef0314868edc9d58a81c0806c8c758af0a (patch) | |
tree | a2c168943d0e15a2d28febf82e31e74b15504117 /core/routes.php | |
parent | 03449dcb9a56e642ff4eee31145498bbaeb83319 (diff) | |
parent | 7a9d60d87eb8e4414e5fe05830b088d426ff810d (diff) | |
download | nextcloud-server-db6361ef0314868edc9d58a81c0806c8c758af0a.tar.gz nextcloud-server-db6361ef0314868edc9d58a81c0806c8c758af0a.zip |
Merge pull request #226 from nextcloud/master-upstream-sync
[Master] upstream sync
Diffstat (limited to 'core/routes.php')
-rw-r--r-- | core/routes.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/routes.php b/core/routes.php index 402277d8f3e..c473408e2e9 100644 --- a/core/routes.php +++ b/core/routes.php @@ -48,6 +48,7 @@ $application->registerRoutes($this, [ ['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'], ['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'], ['name' => 'token#generateToken', 'url' => '/token/generate', 'verb' => 'POST'], + ['name' => 'occ#execute', 'url' => '/occ/{command}', 'verb' => 'POST'], ['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'], ['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'], ['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'], |