summaryrefslogtreecommitdiffstats
path: root/apidoc
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 /apidoc
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 'apidoc')
-rw-r--r--apidoc/index.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/apidoc/index.html b/apidoc/index.html
index 1ff94a5..00a6234 100644
--- a/apidoc/index.html
+++ b/apidoc/index.html
@@ -3,7 +3,7 @@
<head lang="en">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <title>vaadin-elements</title>
+ <title>vaadin-core-elements</title>
<style>
body {
font-family: 'Roboto', 'Noto', sans-serif;
@@ -47,7 +47,7 @@
<body>
<section>
- <h1>API documentation for vaadin-elements</h1>
+ <h1>API documentation for vaadin-core-elements</h1>
<ul>
<li>
<a id="vaadin-grid" href="../../vaadin-grid/index.html">vaadin-grid</a>