]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad1368f b18bf1e)
Merge remote-tracking branch 'origin/master' into 7.3
authorArtur Signell <artur@vaadin.com>
Tue, 19 Aug 2014 11:00:25 +0000 (14:00 +0300)
committerArtur Signell <artur@vaadin.com>
Tue, 19 Aug 2014 11:00:25 +0000 (14:00 +0300)

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