]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into grid-7.5
authorMarkus Koivisto <markus@vaadin.com>
Wed, 8 Apr 2015 11:53:27 +0000 (14:53 +0300)
committerMarkus Koivisto <markus@vaadin.com>
Wed, 8 Apr 2015 11:53:27 +0000 (14:53 +0300)
commit2478267d11fddfd798fee89227b5f258441e1331
treead41582f60af26d2b47959f00130f48a0a510919
parenta1aa700db37f727bb6a3690f1704d3ec512ee468
parent6abcbdf1eeb8f23ebda97df3ffad7b0abdee37ea
Merge branch 'master' into grid-7.5

Conflicts:
WebContent/release-notes.html

Change-Id: I3906caeb01d1991dc9cb927b3d9ce0fb21c77e04
WebContent/release-notes.html