]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe01cb0 9513ddc)
Merge branch 'refs/heads/master' into 'snapshot/7.5'
authorTeamcity <build@vaadin.com>
Thu, 23 Apr 2015 12:44:12 +0000 (15:44 +0300)
committerTeamcity <build@vaadin.com>
Thu, 23 Apr 2015 12:44:12 +0000 (15:44 +0300)

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