vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 17:19:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '4.0'

Browse source 
Conflicts:
	build.gradle
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
This commit is contained in:
Florian Schmaus 2014-06-07 12:24:51 +02:00
commit 3e18a23e47
4 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLError.java
View file

@ -29,6 +29,7 @@ public enum SASLError {
invalid_authzid,
invalid_mechanism,
malformed_request,
mechanism_too_weak,
not_authorized,
temporary_auth_failure;