diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2015-12-16 21:55:44 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2015-12-16 21:59:08 +0200 |
| commit | a235bbda45d3687f486e61b58b00112e028df055 (patch) | |
| tree | ddaa561099875b6cff229d4427dda79220b8ecf7 /bower.json | |
| parent | 6fa0d7c6beafcc3b7757cd5a7aaf15151166974c (diff) | |
| parent | e0d454f56deafa9ab351f699808de37b42cec56e (diff) | |
| download | vaadin-core-a235bbda45d3687f486e61b58b00112e028df055.tar.gz vaadin-core-a235bbda45d3687f486e61b58b00112e028df055.zip | |
Merge '0.3.0' to 'master'
Conflicts:
README.md
bower.json
package.json
tasks/config.js
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -1,15 +1,21 @@ { - "name": "vaadin-elements", - "version": "0.3.0-beta12", + "name": "vaadin-core-elements", + "version": "0.3.0", "authors": [ "Vaadin Ltd" ], - "description": "Vaadin Elements is an evolving set of custom HTML elements, built using Polymer, for building mobile and desktop web applications in modern browsers.", + "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.", "license": "Apache-2.0", "keywords": [ + "vaadin", + "core", + "elements", + "web", + "components", + "webcomponents", "web-components" ], - "main": "vaadin-elements.html", + "main": "vaadin-core-elements.html", "ignore": [ "**/.*", "**/node_modules", @@ -18,7 +24,7 @@ "**/tests" ], "dependencies": { - "vaadin-grid": "vaadin/vaadin-grid#0.9.0-beta5", + "vaadin-grid": "vaadin/vaadin-grid#~1.0.0", "vaadin-combo-box": "vaadin/vaadin-combo-box#1.0.0-alpha2" }, "devDependencies": { |