aboutsummaryrefslogtreecommitdiffstats
path: root/vaadin-core-elements.html
diff options
context:
space:
mode:
authorSauli Tähkäpää <sauli@vaadin.com>2015-12-16 21:55:44 +0200
committerSauli Tähkäpää <sauli@vaadin.com>2015-12-16 21:59:08 +0200
commita235bbda45d3687f486e61b58b00112e028df055 (patch)
treeddaa561099875b6cff229d4427dda79220b8ecf7 /vaadin-core-elements.html
parent6fa0d7c6beafcc3b7757cd5a7aaf15151166974c (diff)
parente0d454f56deafa9ab351f699808de37b42cec56e (diff)
downloadvaadin-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 'vaadin-core-elements.html')
-rw-r--r--vaadin-core-elements.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/vaadin-core-elements.html b/vaadin-core-elements.html
new file mode 100644
index 0000000..316b174
--- /dev/null
+++ b/vaadin-core-elements.html
@@ -0,0 +1,2 @@
+<link rel="import" href="../vaadin-grid/vaadin-grid.html">
+<link rel="import" href="../vaadin-combo-box/vaadin-combo-box.html">