]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f122b59 522c3dd)
Merge branch 'refs/heads/master' into 'snapshot/7.5'
authorTeamcity <build@vaadin.com>
Thu, 16 Apr 2015 10:24:20 +0000 (13:24 +0300)
committerTeamcity <build@vaadin.com>
Thu, 16 Apr 2015 10:24:20 +0000 (13:24 +0300)

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