diff options
| author | Build Agent <build@vaadin.com> | 2014-04-14 20:14:48 +0300 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-04-14 20:14:48 +0300 |
| commit | 4a3fe8e346ba2f3376492836763383d53e9be689 (patch) | |
| tree | 802da90f0b67ea635a55cc27251e044eb28321e8 /push/ivy.xml | |
| parent | afd759e95c0e180b9140882cf99e221800a85609 (diff) | |
| parent | 3ba1e69db01dc1707135db2b64d4c1bdc945a70f (diff) | |
| download | vaadin-framework-4a3fe8e346ba2f3376492836763383d53e9be689.tar.gz vaadin-framework-4a3fe8e346ba2f3376492836763383d53e9be689.zip | |
Merge changes from origin/7.2
e697d8b Merge "Merge branch 'master' into 7.2" into 7.2
4879639 Redo Push reconnect tests.
8314e3c Downgrade Atmosphere client jQuery 2.0.3 -> 1.11.0. (#13374)
dab3e63 Disable PopupView Animations (#13593)
3ba1e69 Update to Atmosphere js 2.1.5.vaadin2 (#13578)
Change-Id: I8205b1d1debeb7c2fd6585021ea76a77abd8403b
Diffstat (limited to 'push/ivy.xml')
| -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 ebdb673cb0..2d13cc9964 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.1.2.vaadin2"> - <!ENTITY atmosphere.js.version "2.1.5.vaadin1"> + <!ENTITY atmosphere.js.version "2.1.5.vaadin2"> ]> <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |