Merge branch 'of-421-mina2' of https://github.com/aberenguel/Openfire into aberenguel-of-421-mina2
Conflicts: build/lib/versions.txt src/java/org/jivesoftware/openfire/nio/ClientConnectionHandler.java src/java/org/jivesoftware/openfire/nio/NIOConnection.java src/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
Showing
File added
No preview for this file type
No preview for this file type
File deleted
File added
No preview for this file type
File added
build/lib/merge/ognl.jar
0 → 100644
File added
File deleted
File deleted
File deleted
File deleted
File deleted
This diff is collapsed.
Please register or sign in to comment