]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c77d31 42146cf)
Merge "Use json from vaadin-shared-deps 1.0.1 (#10118)"
authorJohannes Dahlström <johannesd@vaadin.com>
Thu, 22 Nov 2012 09:46:36 +0000 (09:46 +0000)
committerVaadin Code Review <review@vaadin.com>
Thu, 22 Nov 2012 09:46:36 +0000 (09:46 +0000)

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