]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe227c0 eae2f81)
Merge branch 'master' into hierarchypaint
authorArtur Signell <artur@vaadin.com>
Thu, 15 Mar 2012 13:39:03 +0000 (15:39 +0200)
committerArtur Signell <artur@vaadin.com>
Thu, 15 Mar 2012 13:39:03 +0000 (15:39 +0200)

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