]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52d8abf 2a60b68)
Merge remote-tracking branch 'origin/master'
authorJohannes Dahlström <johannesd@vaadin.com>
Tue, 24 Jul 2012 12:07:03 +0000 (15:07 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Tue, 24 Jul 2012 12:07:03 +0000 (15:07 +0300)

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