src/web/WEB-INF/admin.tld · a1cf99e08c12cce997a663caea89715562c9134b · Administrator / Openfire

Merge remote-tracking branch 'upstream/master' into refactor-connectionmanagement · 3b625223

Guus der Kinderen authored Nov 30, 2015

Conflicts:
	src/java/org/jivesoftware/openfire/XMPPServer.java
	src/java/org/jivesoftware/openfire/net/SASLAuthentication.java
	src/java/org/jivesoftware/openfire/net/ServerStanzaHandler.java
	src/java/org/jivesoftware/openfire/session/LocalClientSession.java
	src/java/org/jivesoftware/util/CertificateManager.java
	src/web/WEB-INF/admin.tld

3b625223

admin.tld 5.54 KB

Replace admin.tld