]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f18a474 2db2f66)
Merge commit '2db2f667e1aff042ed6f3605675526f41e1e59b6'
authorArtur Signell <artur@vaadin.com>
Wed, 5 Mar 2014 15:21:07 +0000 (17:21 +0200)
committerArtur Signell <artur@vaadin.com>
Wed, 5 Mar 2014 15:21:28 +0000 (17:21 +0200)
No-op merge as master already uses a newer Atmosphere version

Change-Id: If7cf3846d149a25c2654ad99e793fb7fe037105c


Trivial merge
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework