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 /package.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 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index 681d4a9..d64af08 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "vaadin-elements", + "name": "vaadin-core-elements", "version": "0.3.0", - "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.", "author": "Vaadin Ltd", "license": "Apache-2.0", "dependencies": { @@ -32,11 +32,11 @@ }, "keywords": [ "vaadin", + "core", "elements", "web", "components", "webcomponents", - "web-components", - "gwt" + "web-components" ] } |