]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94dbeff 16d9f8e)
Merge branch 'contrib'
authorLeif Åstrand <leif@vaadin.com>
Mon, 2 Jan 2012 11:03:55 +0000 (13:03 +0200)
committerLeif Åstrand <leif@vaadin.com>
Mon, 2 Jan 2012 11:03:55 +0000 (13:03 +0200)

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