]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45f92ac 5aee23e)
Merge branch 'master' into feature/elements feature/elements
authorManolo Carrasco <manolo@vaadin.com>
Tue, 19 Jul 2016 10:50:47 +0000 (12:50 +0200)
committerManolo Carrasco <manolo@vaadin.com>
Tue, 19 Jul 2016 10:50:47 +0000 (12:50 +0200)

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