]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cddeca5 6e1f6b6)
Merge branch 'master' into gwt
authorHenri Sara <hesara@vaadin.com>
Thu, 21 Jun 2012 14:11:53 +0000 (17:11 +0300)
committerHenri Sara <hesara@vaadin.com>
Thu, 21 Jun 2012 14:11:53 +0000 (17:11 +0300)

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