diff options
| author | Manuel Carrasco Moñino <manolo@apache.org> | 2017-04-12 14:15:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-12 14:15:57 +0200 |
| commit | b7a8ab21543f875cf30d505dccca89de6e5a0e44 (patch) | |
| tree | 866b4dc3089c319e743daa9739be42b7a30ef60c | |
| parent | 11446b5ae3f037528b5dcb451447297ea7b81148 (diff) | |
| parent | 159b7caf793df2ab1d4f7eda60f1df982530f810 (diff) | |
| download | vaadin-core-b7a8ab21543f875cf30d505dccca89de6e5a0e44.tar.gz vaadin-core-b7a8ab21543f875cf30d505dccca89de6e5a0e44.zip | |
Merge pull request #100 from vaadin/relase-1.6.0v1.6.0
Relase 1.6.0
| -rw-r--r-- | bower.json | 11 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 6 insertions, 7 deletions
@@ -24,13 +24,13 @@ "**/tests" ], "dependencies": { - "vaadin-grid": "vaadin/vaadin-grid#1.2.x", "vaadin-combo-box": "vaadin/vaadin-combo-box#1.3.x", - "vaadin-icons": "vaadin/vaadin-icons#1.0.x", + "vaadin-context-menu": "vaadin/vaadin-context-menu#1.0.x", "vaadin-date-picker": "vaadin/vaadin-date-picker#1.2.x", - "vaadin-upload": "vaadin/vaadin-upload#1.1.x", - "vaadin-split-layout": "vaadin/vaadin-split-layout#1.0.x", - "vaadin-context-menu": "vaadin/vaadin-context-menu#1.0.x" + "vaadin-grid": "vaadin/vaadin-grid#2.0.x", + "vaadin-icons": "vaadin/vaadin-icons#3.0.x", + "vaadin-split-layout": "vaadin/vaadin-split-layout#1.1.x", + "vaadin-upload": "vaadin/vaadin-upload#1.1.x" }, "devDependencies": { "web-component-tester": "^4.0.3", @@ -38,7 +38,6 @@ "iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0", "iron-component-page": "polymerelements/iron-component-page#~1.1.0", "elements-demo-resources": "vaadin/elements-demo-resources#master", - "components-demo-resources": "vaadin/components-demo-resources#master", "mock-http-request": "philikon/MockHttpRequest#master", "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0", "paper-toast": "polymerelements/paper-toast#^1.0.0", diff --git a/package.json b/package.json index 8f14e6d..3dcd4df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vaadin-core-elements", - "version": "1.5.0", + "version": "1.6.0", "description": "Vaadin Core Elements is an evolving set of free, open sourced custom HTML elements, built using Polymer, for building mobile and desktop web applications in modern browsers.", "author": "Vaadin Ltd", "license": "Apache-2.0", |