mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
7751c44487
# 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