]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 428c580 8d6256e)
Merge branch 'master' into grid-merge
authorHenrik Paul <henrik@vaadin.com>
Wed, 4 Dec 2013 13:36:52 +0000 (15:36 +0200)
committerHenrik Paul <henrik@vaadin.com>
Wed, 4 Dec 2013 13:37:32 +0000 (15:37 +0200)
Change-Id: I2502ed31f81326b2e32a03ad34c289a5bf7bd2b5


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