diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
commit | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch) | |
tree | 03204a408d56311692c3528bedcf95d2455e94f2 /server/controllers/api/v1/index.js | |
parent | 052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff) | |
parent | c4403b29ad4db097af528a7f04eea07e0ed320d0 (diff) | |
download | PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.gz PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.zst PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.zip |
Merge branch 'master' into webseed-merged
Diffstat (limited to 'server/controllers/api/v1/index.js')
-rw-r--r-- | server/controllers/api/v1/index.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/server/controllers/api/v1/index.js b/server/controllers/api/v1/index.js index e0c29a8a2..2e4fb2dab 100644 --- a/server/controllers/api/v1/index.js +++ b/server/controllers/api/v1/index.js | |||
@@ -4,13 +4,17 @@ const express = require('express') | |||
4 | 4 | ||
5 | const router = express.Router() | 5 | const router = express.Router() |
6 | 6 | ||
7 | const clientsController = require('./clients') | ||
7 | const podsController = require('./pods') | 8 | const podsController = require('./pods') |
8 | const remoteController = require('./remote') | 9 | const remoteController = require('./remote') |
10 | const requestsController = require('./requests') | ||
9 | const usersController = require('./users') | 11 | const usersController = require('./users') |
10 | const videosController = require('./videos') | 12 | const videosController = require('./videos') |
11 | 13 | ||
14 | router.use('/clients', clientsController) | ||
12 | router.use('/pods', podsController) | 15 | router.use('/pods', podsController) |
13 | router.use('/remote', remoteController) | 16 | router.use('/remote', remoteController) |
17 | router.use('/requests', requestsController) | ||
14 | router.use('/users', usersController) | 18 | router.use('/users', usersController) |
15 | router.use('/videos', videosController) | 19 | router.use('/videos', videosController) |
16 | router.use('/*', badRequest) | 20 | router.use('/*', badRequest) |