]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49d3a11 9f6bcea)
Merge branch 'master' of ssh://dev.vaadin.com/vaadin
authorMarko Gronroos <magi@vaadin.com>
Fri, 7 Sep 2012 12:29:22 +0000 (15:29 +0300)
committerMarko Gronroos <magi@vaadin.com>
Fri, 7 Sep 2012 12:29:22 +0000 (15:29 +0300)

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