Merge branch 'master' into news

This commit is contained in:
Nathan Leniz
2015-03-07 15:23:56 +09:00
6 changed files with 155 additions and 316 deletions

2
app.js
View File

@@ -421,7 +421,7 @@ app.post('/account/profile', userController.postUpdateProfile);
app.post('/account/password', userController.postUpdatePassword);
app.post('/account/delete', userController.postDeleteAccount);
app.get('/account/unlink/:provider', userController.getOauthUnlink);
app.get('/sitemap.xml', resourcesController.sitemap);
/**
* API examples routes.