Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/OF-2559_mina-to-netty' into OF-2…
Browse files Browse the repository at this point in the history
…559_mina-to-netty

# Conflicts:
#	xmppserver/src/main/java/org/jivesoftware/openfire/net/RespondingServerStanzaHandler.java
#	xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyOutboundConnectionHandler.java
#	xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettySessionInitializer.java
#	xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
#	xmppserver/src/test/java/org/jivesoftware/openfire/session/LocalOutgoingServerSessionTest.java
#	xmppserver/src/test/java/org/jivesoftware/openfire/session/RemoteReceivingServerDummy.java
  • Loading branch information
viv committed Jul 25, 2023
2 parents a250c17 + 36abd9a commit ca54c54
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ca54c54

Please sign in to comment.