diff options
| author | Artur Signell <artur@vaadin.com> | 2015-09-04 15:05:27 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-09-04 15:05:27 +0300 |
| commit | f46be1b2792755cb7d9b111068dd6cf202398c4a (patch) | |
| tree | 74f7098faee688cc1f1ca1b6ffe9e912338bbcaf /push | |
| parent | e603ea3cf91e5dd0893b766f27d400947527fba9 (diff) | |
| parent | ebceef4d44bcd61605fa92fcf7be8d3678537599 (diff) | |
| download | vaadin-framework-f46be1b2792755cb7d9b111068dd6cf202398c4a.tar.gz vaadin-framework-f46be1b2792755cb7d9b111068dd6cf202398c4a.zip | |
Merge remote-tracking branch 'origin/master' into reconnect-dialog
Change-Id: Ie622160a83116c83b255a26bec297f73f3223ac7
Diffstat (limited to 'push')
| -rw-r--r-- | push/ivy.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/push/ivy.xml b/push/ivy.xml index faf96818e1..180eeac7b8 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -3,7 +3,7 @@ <!-- Keep the version number in sync with build.xml --> <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1"> - <!ENTITY atmosphere.js.version "2.2.6.vaadin4"> + <!ENTITY atmosphere.js.version "2.2.6.vaadin5"> ]> <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |