]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68e52cf 822aa7c)
Merge branch 'master' of ssh://git@dev.vaadin.com/vaadin.git
authorLeif Åstrand <leif@vaadin.com>
Wed, 2 Nov 2011 07:46:49 +0000 (09:46 +0200)
committerLeif Åstrand <leif@vaadin.com>
Wed, 2 Nov 2011 07:46:49 +0000 (09:46 +0200)

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