]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bda753 0fff9b0)
Merge remote branch 'origin/master' into contrib
authorJens Jansson <peppe@vaadin.com>
Fri, 20 Jan 2012 14:16:02 +0000 (16:16 +0200)
committerJens Jansson <peppe@vaadin.com>
Fri, 20 Jan 2012 14:16:02 +0000 (16:16 +0200)

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