diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-07-23 13:18:19 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-07-23 13:18:19 +0300 |
| commit | 3bbb824c7f1dd9ed23fd65283332db31a24a1935 (patch) | |
| tree | 163ce11cbeefb1c0f9ae3302e36c025c3d45fe22 /WebContent | |
| parent | 2a94befa3537937d099544a2d307bb177175eb15 (diff) | |
| parent | 62c63a6a6dcf97c5a8f7b02e0115fdab096226db (diff) | |
| download | vaadin-framework-3bbb824c7f1dd9ed23fd65283332db31a24a1935.tar.gz vaadin-framework-3bbb824c7f1dd9ed23fd65283332db31a24a1935.zip | |
Merge changes from origin/7.1
36aebc8 Update to Atmosphere 1.0.14.vaadin4 (#12242)
62c63a6 Only add DateRangeValidator to DateField if start or end of range is set (#12193)
Change-Id: Ie2ba84e2d598313158007e521508c756abef6c2e
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/jquery.atmosphere.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebContent/VAADIN/jquery.atmosphere.js b/WebContent/VAADIN/jquery.atmosphere.js index bb597f01b5..28a7d033bd 100644 --- a/WebContent/VAADIN/jquery.atmosphere.js +++ b/WebContent/VAADIN/jquery.atmosphere.js @@ -49,7 +49,8 @@ jQuery.atmosphere = function() { }; return { - version : "1.0.13", + // Keep the version number in sync with push/build.xml and other locations listed in that file + version : "1.0.14.vaadin4", requests : [], callbacks : [], |