Merge remote-tracking branch 'upstream/staging' into staging

2015-05-01 07:52:50 -04:00
parent 55afd8518c 6c9a039a01
commit 322fce8c3e
7 changed files with 62 additions and 20 deletions
--- a/app.js
+++ b/app.js
@@ -520,6 +520,16 @@ app.post(
  storyController.upvote
 );

+app.get(
+  '/unsubscribe/:email',
+  resourcesController.unsubscribe
+);
+
+app.get(
+  '/unsubscribed',
+  resourcesController.unsubscribed
+);
+
 app.all('/account', passportConf.isAuthenticated);

 app.get('/account/api', userController.getAccountAngular);