diff options
| author | Henri Sara <hesara@vaadin.com> | 2015-08-19 11:54:59 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2015-08-19 11:54:59 +0300 |
| commit | 123c9fbc74d52c66f59bb825414ad3260aaea975 (patch) | |
| tree | 8deda9347560f9324d36a5513d4a6fc555d0f13d /WebContent/license.html | |
| parent | 7a3e03b5acd416141e1a95eae32c3808a8e5addd (diff) | |
| parent | e7fda93b300b11d9507f25917306e1f3d57cb27c (diff) | |
| download | vaadin-framework-123c9fbc74d52c66f59bb825414ad3260aaea975.tar.gz vaadin-framework-123c9fbc74d52c66f59bb825414ad3260aaea975.zip | |
Merge branch 'master-before-18503' into grid-unbuffered-editor
Conflicts:
server/src/com/vaadin/data/RpcDataProviderExtension.java
uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
Change-Id: I9e7907c9caf839fd043444db0505f9853f020a6a
Diffstat (limited to 'WebContent/license.html')
0 files changed, 0 insertions, 0 deletions