Merge pull request #2074 from emanuelschuetze/bower

Use angular 1.4.10
This commit is contained in:
Norman Jäckel 2016-04-12 22:35:10 +02:00
commit d37746286c

View File

@ -3,8 +3,8 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"jquery": "~2.2.3", "jquery": "~2.2.3",
"angular": "~1.4.9", "angular": "~1.4.10",
"angular-animate": "~1.4.9", "angular-animate": "~1.4.10",
"angular-bootstrap": "~0.14.3", "angular-bootstrap": "~0.14.3",
"angular-bootstrap-colorpicker": "~3.0.24", "angular-bootstrap-colorpicker": "~3.0.24",
"angular-chosen-localytics": "~1.4.0", "angular-chosen-localytics": "~1.4.0",
@ -13,9 +13,9 @@
"angular-formly-templates-bootstrap": "~6.2.0", "angular-formly-templates-bootstrap": "~6.2.0",
"angular-gettext": "~2.2.0", "angular-gettext": "~2.2.0",
"angular-loading-bar": "~0.8.0", "angular-loading-bar": "~0.8.0",
"angular-messages": "~1.4.9", "angular-messages": "~1.4.10",
"angular-pdf": "~1.3.0", "angular-pdf": "~1.3.0",
"angular-sanitize": "~1.4.9", "angular-sanitize": "~1.4.10",
"angular-scroll-glue": "~2.0.6", "angular-scroll-glue": "~2.0.6",
"angular-ui-router": "~0.2.17", "angular-ui-router": "~0.2.17",
"angular-ui-tinymce": "0.0.14", "angular-ui-tinymce": "0.0.14",
@ -47,6 +47,6 @@
} }
}, },
"resolutions": { "resolutions": {
"angular": ">=1.4.9 <1.5" "angular": ">=1.4.10 <1.5"
} }
} }