]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into grid-unbuffered-editor 7.6.0.alpha3
authorJohannes Dahlström <johannesd@vaadin.com>
Wed, 15 Jul 2015 09:59:35 +0000 (12:59 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Wed, 15 Jul 2015 09:59:35 +0000 (12:59 +0300)
commit20f6053dc199d5dd7dde071dfdd9b37ea8f85e36
treecef44905e38c849057f102cd26cd6b89251bc7e2
parent80058d9429940c376c63c086b1cf79848fe1a699
parent9734bc5dfa5d919e3214dc17581d3da3ad1a3ebd
Merge branch 'master' into grid-unbuffered-editor

Conflicts:
uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java

Change-Id: I5ed68bc73d38be4e1f6816108a5246d0c98a258f
client/src/com/vaadin/client/widgets/Grid.java
uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java