Skip to content
Snippets Groups Projects
Commit 56351a72 authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Merge branch 'node' into upload

Conflicts:
	libs/app.js

Foi mantida as alterações do branch `upload`, exceto pela rota para o token
parents e49b09fd ba88cf9c
No related branches found
No related tags found
1 merge request!1Reimplementação em NodeJS
......@@ -34,7 +34,7 @@ app.use('/v1/u', usuarios)
app.use('/v1/materias', materias)
app.use('/v1/professores', professores)
app.use('/v1/arquivos', arquivos)
app.use('/oauth/token', oauth2.token)
app.use('/v1/oauth/token', oauth2.token)
// catch 404 and forward to error handler
app.use(function(req, res, next){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment