]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98c4fdf 5c0da47)
Merge branch 'debug-console'
authorJohannes Dahlström <johannesd@vaadin.com>
Fri, 20 Jul 2012 15:45:36 +0000 (18:45 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Fri, 20 Jul 2012 15:45:36 +0000 (18:45 +0300)

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