summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSauli Tähkäpää <sauli@vaadin.com>2015-11-26 14:20:55 +0200
committerSauli Tähkäpää <sauli@vaadin.com>2015-12-03 14:07:44 +0200
commit04d73f8b89b5c9a7711ab89afd634a8c188becbf (patch)
treef5af93a87275a6db81c51ed354294de7af101fef
parent9604588bea487888d30bfd95862fbeb3a8911db1 (diff)
downloadvaadin-core-04d73f8b89b5c9a7711ab89afd634a8c188becbf.tar.gz
vaadin-core-04d73f8b89b5c9a7711ab89afd634a8c188becbf.zip
Add vaadin-combo-box#master as a dependency.
-rw-r--r--bower.json3
-rw-r--r--vaadin-elements.html1
2 files changed, 3 insertions, 1 deletions
diff --git a/bower.json b/bower.json
index 338c4ad..4fecac1 100644
--- a/bower.json
+++ b/bower.json
@@ -18,7 +18,8 @@
"**/tests"
],
"dependencies": {
- "vaadin-grid": "vaadin/vaadin-grid#0.9.0-beta5"
+ "vaadin-grid": "vaadin/vaadin-grid#0.9.0-beta5",
+ "vaadin-combo-box": "vaadin/vaadin-combo-box#master"
},
"devDependencies": {
"iron-component-page": "polymerelements/iron-component-page#~1.1.0",
diff --git a/vaadin-elements.html b/vaadin-elements.html
index 4e1e836..316b174 100644
--- a/vaadin-elements.html
+++ b/vaadin-elements.html
@@ -1 +1,2 @@
<link rel="import" href="../vaadin-grid/vaadin-grid.html">
+<link rel="import" href="../vaadin-combo-box/vaadin-combo-box.html">