diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 11:56:53 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 12:29:24 +0200 |
| commit | 741e798633edd584e62bcb4e6a00911a86908cdf (patch) | |
| tree | 22d3b4c625376ba7f79ec82488a64f1696539d5b /push/build.xml | |
| parent | 3c84a54591d792b69a4d6d736714941edb1d818a (diff) | |
| parent | 4db0b55aefd83d149e62a7fad2b14fb232d976c8 (diff) | |
| download | vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.tar.gz vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.zip | |
Merge branch 'master' into grid-columnreorder
Conflicts:
uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
Change-Id: Ic77c717b9bbdcc38585382d4944ee4491aba3f7d
Diffstat (limited to 'push/build.xml')
| -rw-r--r-- | push/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/push/build.xml b/push/build.xml index 9afe76620c..519dc81ed2 100644 --- a/push/build.xml +++ b/push/build.xml @@ -18,7 +18,7 @@ location="${result.dir}/js/VAADIN/vaadinPush.debug.js" /> <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java --> - <property name="atmosphere.runtime.version" value="2.2.4.vaadin2" /> + <property name="atmosphere.runtime.version" value="2.2.4.vaadin4" /> <property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" /> <path id="classpath.compile.custom" /> |