]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c7644f 59974ed)
Merge branch 'master' of ssh://dev.vaadin.com/vaadin
authorArtur Signell <artur@vaadin.com>
Tue, 1 Nov 2011 12:05:51 +0000 (14:05 +0200)
committerArtur Signell <artur@vaadin.com>
Tue, 1 Nov 2011 12:05:51 +0000 (14:05 +0200)

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