vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src
History
Florian Schmaus fbf0ba13ce Merge Smack 4.1.0-rc2 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
	version.gradle
 		2015-02-21 18:07:45 +01:00
..
integration-test/java/org/jivesoftware/smackx s/ a XMPP/ an XMPP/ 2015-02-12 12:13:19 +01:00
main Merge Smack 4.1.0-rc2 2015-02-21 18:07:45 +01:00
test Merge Smack 4.1.0-rc2 2015-02-21 18:07:45 +01:00