]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into sass
authorMarc Englund <marc@vaadin.com>
Thu, 4 Oct 2012 06:34:37 +0000 (09:34 +0300)
committerMarc Englund <marc@vaadin.com>
Thu, 4 Oct 2012 06:34:37 +0000 (09:34 +0300)
commit0f5606dace38d575efcd2e0109390b34aebb05d3
tree5d0a032ebecbec80a33f90971ae2d0a37ab43956
parent76b0655b29ed8aa4b1287f2b68322ed1f9c58faa
parent7fbe0ffd7c967728a1e437d0cbe03722ed9f1b6e
Merge branch 'master' into sass

Conflicts:
WebContent/VAADIN/themes/base/formlayout/formlayout.scss
WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss

Change-Id: Ie895a1bbafdcf2fe79d500efb04c6eef3f5a812e
WebContent/VAADIN/themes/base/formlayout/formlayout.scss
WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss