diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-02-14 12:48:07 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-02-14 12:48:07 +0200 |
| commit | 0628eea037ebb9f47ad77f37c59145082fc2e74c (patch) | |
| tree | b9ed441c79ba1e4acad13aa70ffdb4379cac5ea9 /WebContent/release-notes.html | |
| parent | ecd80181d160b58a281eb92fabaa2a10ea0adac2 (diff) | |
| parent | 36f749b4f83086a5306726ad607c9bb3a0fa7526 (diff) | |
| download | vaadin-framework-0628eea037ebb9f47ad77f37c59145082fc2e74c.tar.gz vaadin-framework-0628eea037ebb9f47ad77f37c59145082fc2e74c.zip | |
Merge remote branch 'origin/6.8'
Conflicts:
WebContent/release-notes.html
tests/test.xml
tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
Diffstat (limited to 'WebContent/release-notes.html')
| -rw-r--r-- | WebContent/release-notes.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index 09f0df7641..1ca217bc56 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -330,11 +330,11 @@ </p> <ul> - <li>Mozilla Firefox 8</li> + <li>Mozilla Firefox 10</li> <li>Internet Explorer 8-9</li> <li>Safari 5</li> <li>Opera 11</li> - <li>Google Chrome 15</li> + <li>Google Chrome 16</li> </ul> <h2 id="vaadinontheweb">Vaadin on the Web</h2> |