]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d89f7a9 5d19da2)
Merge branch 'master' into grid-merge
authorHenrik Paul <henrik@vaadin.com>
Thu, 12 Dec 2013 13:06:03 +0000 (15:06 +0200)
committerHenrik Paul <henrik@vaadin.com>
Thu, 12 Dec 2013 13:06:28 +0000 (15:06 +0200)
Change-Id: Id50e7f1db2c56545558e4261ca5d84a419e096a9


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