]> source.dussan.org Git - vaadin-framework.git/commit
Merge commit '06d0cf4daa414eca3c2a73df8171706ca7012213'
authorTeemu Suo-Anttila <teemusa@vaadin.com>
Tue, 4 Mar 2014 11:13:23 +0000 (13:13 +0200)
committerTeemu Suo-Anttila <teemusa@vaadin.com>
Tue, 4 Mar 2014 11:13:23 +0000 (13:13 +0200)
commit16d089f7c4a0de5b996b7afaa19a0709aac5001d
tree75415db6b890bf6107820aa903bf827eb6e21437
parentf99e824c198204db1ea385331630b2e5cec49eda
parent06d0cf4daa414eca3c2a73df8171706ca7012213
Merge commit '06d0cf4daa414eca3c2a73df8171706ca7012213'

Conflicts:
uitest/src/com/vaadin/tests/push/PushConfigurationTest.java

Change-Id: Ifb458fce1a9a1fa84d935b893f5af1931951058c
client/src/com/vaadin/client/communication/AtmospherePushConnection.java
uitest/src/com/vaadin/tests/push/PushConfigurationTest.java