mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-20 12:19:16 +00:00
# Conflicts: # spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java # spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardToWebSocketExtensionAdapter.java # spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsClient.java