]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91b4055 4997335)
Merge commit '49973354b22e8aba9cc71f83571020b0414c54e0'
authorSauli Tähkäpää <sauli@vaadin.com>
Fri, 21 Mar 2014 08:18:57 +0000 (10:18 +0200)
committerSauli Tähkäpää <sauli@vaadin.com>
Fri, 21 Mar 2014 08:19:47 +0000 (10:19 +0200)
Conflicts:
shared/ivy.xml

Change-Id: I2aa7cc35953fdc7441d1a5b15a7bf0a34a97db7f


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