Merge pull request #26 from torsten-sauer/angular_1.5

guylabs · web-flow · commit 6c5c6c7a24c6 · 2016-06-10T08:26:32.000+02:00
version bump to angular 1.5
diff --git a/bower.json b/bower.json
@@ -33,10 +33,10 @@
         "url": "https://github.com/guylabs/angular-spring-data-rest.git"
     },
     "dependencies": {
-      "angular": "~1.4.8",
-      "angular-resource": "~1.4.8"
+      "angular": "~1.5.0",
+      "angular-resource": "~1.5.0"
     },
     "devDependencies": {
-      "angular-mocks": "~1.4.8"
+      "angular-mocks": "~1.5.0"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@`
`33`	`33`	`"url": "https://github.com/guylabs/angular-spring-data-rest.git"`
`34`	`34`	`},`
`35`	`35`	`"dependencies": {`
`36`		`- "angular": "~1.4.8",`
`37`		`- "angular-resource": "~1.4.8"`
	`36`	`+ "angular": "~1.5.0",`
	`37`	`+ "angular-resource": "~1.5.0"`
`38`	`38`	`},`
`39`	`39`	`"devDependencies": {`
`40`		`- "angular-mocks": "~1.4.8"`
	`40`	`+ "angular-mocks": "~1.5.0"`
`41`	`41`	`}`
`42`	`42`	`}`