]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote-tracking branch 'origin/master' into grid
authorArtur Signell <artur@vaadin.com>
Wed, 14 Jan 2015 08:18:39 +0000 (10:18 +0200)
committerArtur Signell <artur@vaadin.com>
Wed, 14 Jan 2015 08:18:39 +0000 (10:18 +0200)
commit032bcef30f5ada7dc1ca6eade07ee596afa25bb3
treea036581c2b7ae7e82fdd60ba92b2fe392b85df7a
parent8a544b5a6e78337b24a5e56bcde1a21ff6087fae
parentb356e7e3bba9b08ad9d1ecdfb4d628b8179ef20a
Merge remote-tracking branch 'origin/master' into grid

Conflicts:
client/src/com/vaadin/client/communication/AtmospherePushConnection.java
server/tests/src/com/vaadin/data/fieldgroup/FieldGroupTests.java
shared/src/com/vaadin/shared/util/SharedUtil.java

Change-Id: I300b5a92bde562390a56b720adf9a37b795c9513
client/src/com/vaadin/client/ApplicationConfiguration.java
client/src/com/vaadin/client/ApplicationConnection.java
client/src/com/vaadin/client/communication/AtmospherePushConnection.java
client/src/com/vaadin/client/extensions/ResponsiveConnector.java
server/src/com/vaadin/data/fieldgroup/FieldGroup.java
server/tests/src/com/vaadin/data/fieldgroup/FieldGroupTests.java
shared/src/com/vaadin/shared/util/SharedUtil.java