]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/master' into grid
authorTeemu Suo-Anttila <teemusa@vaadin.com>
Tue, 1 Jul 2014 10:32:29 +0000 (13:32 +0300)
committerTeemu Suo-Anttila <teemusa@vaadin.com>
Tue, 1 Jul 2014 10:33:21 +0000 (13:33 +0300)
commitb159b8bfe615b7fb273d652b9c9bbc9f04901873
treed8c3b9b7ac5e31ac46d68895985014e443ba7572
parentcad8f2bf2c02fbe2a6f406d51103909d78033c9d
parent264e617c58d537d12a03b5f3fb73f5129fcadc09
Merge remote-tracking branch 'origin/master' into grid

Conflicts:
WebContent/release-notes.html

Change-Id: I515edf75b3ba2eb0bf94fa0d747cadbce2c79a21
WebContent/VAADIN/themes/base/base.scss
WebContent/release-notes.html