]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3c1199 59dd7f7)
Merge branch 'master' of ssh://dev.vaadin.com/vaadin
authorMarko Gronroos <magi@vaadin.com>
Thu, 22 Dec 2011 18:46:10 +0000 (20:46 +0200)
committerMarko Gronroos <magi@vaadin.com>
Thu, 22 Dec 2011 18:46:10 +0000 (20:46 +0200)

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