added angualar-material

AbstractedChalupas · Jan 11, 2016 · 7becf81 · 7becf81
1 parent 8e00414
commit 7becf81
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 28 deletions.
diff --git a/bower.json b/bower.json
@@ -14,8 +14,12 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "~1.3.16",
-    "angular-route": "~1.3.16",
-    "angular-mocks": "~1.3.16",
+    "angular": "~1.4.8",
+    "angular-route": "~1.4.8",
+    "angular-mocks": "~1.4.8",
+    "angular-material": "~1.0.1"
+  },
+  "resolutions": {
+    "angular": "1.4.8"
   }
 }
diff --git a/npm-debug.log b/npm-debug.log
diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "bcrypt": "^0.8.5",
     "bluebird": "^3.1.1",
     "body-parser": "^1.14.2",
+    "cors": "^2.7.1",
     "express": "^4.13.3",
     "express-session": "^1.12.1",
     "mongoose": "^4.3.4",