aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers/api/v1/index.js
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-10-02 15:39:09 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-10-02 15:39:09 +0200
commita6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch)
tree03204a408d56311692c3528bedcf95d2455e94f2 /server/controllers/api/v1/index.js
parent052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff)
parentc4403b29ad4db097af528a7f04eea07e0ed320d0 (diff)
downloadPeerTube-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.js4
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
5const router = express.Router() 5const router = express.Router()
6 6
7const clientsController = require('./clients')
7const podsController = require('./pods') 8const podsController = require('./pods')
8const remoteController = require('./remote') 9const remoteController = require('./remote')
10const requestsController = require('./requests')
9const usersController = require('./users') 11const usersController = require('./users')
10const videosController = require('./videos') 12const videosController = require('./videos')
11 13
14router.use('/clients', clientsController)
12router.use('/pods', podsController) 15router.use('/pods', podsController)
13router.use('/remote', remoteController) 16router.use('/remote', remoteController)
17router.use('/requests', requestsController)
14router.use('/users', usersController) 18router.use('/users', usersController)
15router.use('/videos', videosController) 19router.use('/videos', videosController)
16router.use('/*', badRequest) 20router.use('/*', badRequest)