]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87fe374 fde3291)
Merge branch '7.4' of ssh://dev.vaadin.com:29418/vaadin into 7.4
authorMarkus Koivisto <markus@vaadin.com>
Wed, 15 Apr 2015 12:52:44 +0000 (15:52 +0300)
committerMarkus Koivisto <markus@vaadin.com>
Wed, 15 Apr 2015 12:52:44 +0000 (15:52 +0300)

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