Merge "Updated AngularJS to 1.2.18"

This commit is contained in:
Jenkins 2014-06-26 15:24:07 +00:00 committed by Gerrit Code Review
commit ad7104f3b2

View File

@ -3,9 +3,9 @@
"version": "0.0.1",
"dependencies": {
"font-awesome": "4.0",
"angular": "1.2.13",
"angular-resource": "1.2.13",
"angular-sanitize": "1.2.13",
"angular": "1.2.18",
"angular-resource": "1.2.18",
"angular-sanitize": "1.2.18",
"bootstrap": "3.1.1",
"angular-ui-router": "0.2.8-bowratic-tedium",
"angular-bootstrap": "0.10.0",
@ -14,7 +14,10 @@
"angular-moment": "0.7.1"
},
"devDependencies": {
"angular-mocks": "1.2.13",
"angular-scenario": "1.2.13"
"angular-mocks": "1.2.18",
"angular-scenario": "1.2.18"
},
"resolutions": {
"angular": "1.2.18"
}
}