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 /tasks/config.js | |
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 'tasks/config.js')
-rw-r--r-- | tasks/config.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tasks/config.js b/tasks/config.js index 1ff8364..89188df 100644 --- a/tasks/config.js +++ b/tasks/config.js @@ -4,7 +4,7 @@ var fs = require('fs'); var userhome = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE; module.exports = { - elements: ['vaadin-grid', 'vaadin-combo-box'], + coreElements: ['vaadin-grid', 'vaadin-combo-box'], version: args.version || 'master', permalink: args.version ? 'latest' : '', toolsHost: args.toolsHostname || 'tools.vaadin.com', |