]> source.dussan.org Git - vaadin-framework.git/commitdiff
Merge branch 'valo' into 7.3
authorHenri Sara <hesara@vaadin.com>
Thu, 5 Jun 2014 13:28:23 +0000 (16:28 +0300)
committerHenri Sara <hesara@vaadin.com>
Thu, 5 Jun 2014 13:28:23 +0000 (16:28 +0300)
Conflicts:
WebContent/release-notes.html

Change-Id: I1cc3028cac865ac83116d666ccc8c1ce7c1b4ccd

1  2 
WebContent/release-notes.html

Simple merge