Merge pull request #97 from mhitza/upgrade/angular-1.2.5

Update angular version to 1.2.5, Thanks @mhitza
scotch · Dec 25, 2013 · 81811c6 · 81811c6
2 parents 3493232 + 2cdfd10
commit 81811c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/app.coffee b/app/app.coffee
@@ -4,6 +4,7 @@
 App = angular.module('app', [
   'ngCookies'
   'ngResource'
+  'ngRoute'
   'app.controllers'
   'app.directives'
   'app.filters'

diff --git a/bower.json b/bower.json
@@ -14,11 +14,12 @@
     "bootstrap-less": "~2.3.2",
     "bootstrap-less-themes": "https://github.com/angular-brunch/bootstrap-less-themes.git",
     "angular-bootstrap": "~0.5.0",
-    "angular": "1.0.7",
-    "angular-sanitize": "1.0.7",
-    "angular-resource": "1.0.7",
-    "angular-cookies": "1.0.7",
-    "angular-mocks": "1.0.7"
+    "angular": "1.2.5",
+    "angular-sanitize": "1.2.5",
+    "angular-resource": "1.2.5",
+    "angular-route": "1.2.5",
+    "angular-cookies": "1.2.5",
+    "angular-mocks": "1.2.5"
   },
   "overrides": {
     "bootstrap-less": {