Skip to content

Commit

Permalink
Merge pull request #22 from vaadin/1.0.0-beta1
Browse files Browse the repository at this point in the history
Depend on Polymer 2.0.0 Stable. Prepare for Beta-1
  • Loading branch information
manolo authored May 18, 2017
2 parents 6d944a1 + 5b9756c commit 05170ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
13 changes: 5 additions & 8 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,15 @@
"wct.conf.js"
],
"devDependencies": {
"elements-demo-resources": "2.0-preview",
"iron-component-page": "#2.0-preview",
"iron-demo-helpers": "#2.0-preview",
"iron-test-helpers": "#2.0-preview",
"web-component-tester": "^6.0.0-prerelease.7"
"elements-demo-resources": "^2.0.0",
"iron-component-page": "^2.0.0",
"iron-demo-helpers": "^2.0.0",
"iron-test-helpers": "^2.0.0",
"web-component-tester": "^6.0.0"
},
"dependencies": {
"polymer": "^2.0.0",
"vaadin-control-state-mixin": "vaadin/vaadin-control-state-mixin#^1.0.0",
"vaadin-themable-mixin": "vaadin/vaadin-themable-mixin#^1.1.0"
},
"resolutions": {
"polymer": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vaadin-button",
"version": "1.0.0-alpha1",
"version": "1.0.0-beta1",
"description": "vaadin-button",
"main": "vaadin-button.html",
"repository": "vaadin/vaadin-button",
Expand Down

0 comments on commit 05170ab

Please sign in to comment.