summaryrefslogtreecommitdiffstats
path: root/bower.json
diff options
context:
space:
mode:
authorTeemu Pòˆntelin <teemu@vaadin.com>2016-08-29 14:37:00 +0300
committerTeemu Pòˆntelin <teemu@vaadin.com>2016-08-29 16:34:21 +0300
commit9e55d6c52d8faa82338b6eae613cd95d112d0e2f (patch)
tree1b466d7df0b1b5a13d9ece2b7c35c5b65302ffb0 /bower.json
parent5d34d324759f329ad713139f09afac0b5320bd01 (diff)
downloadvaadin-core-9e55d6c52d8faa82338b6eae613cd95d112d0e2f.tar.gz
vaadin-core-9e55d6c52d8faa82338b6eae613cd95d112d0e2f.zip
Generate a separate bower.json with overrides for master
Diffstat (limited to 'bower.json')
-rw-r--r--bower.json11
1 files changed, 11 insertions, 0 deletions
diff --git a/bower.json b/bower.json
index faa6636..1b852bb 100644
--- a/bower.json
+++ b/bower.json
@@ -41,5 +41,16 @@
},
"resolutions": {
"polymer": "v1.1.1"
+ },
+ "masterOverrides": {
+ "version": "master",
+ "dependencies": {
+ "vaadin-grid": "vaadin/vaadin-grid#master",
+ "vaadin-combo-box": "vaadin/vaadin-combo-box#master",
+ "vaadin-icons": "vaadin/vaadin-icons#master",
+ "vaadin-date-picker": "vaadin/vaadin-date-picker#master",
+ "vaadin-upload": "vaadin/vaadin-upload#master",
+ "vaadin-split-layout": "vaadin/vaadin-split-layout#master"
+ }
}
}