1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 08:12:05 +01:00
Smack/smack-extensions/src/main
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
..
java/org/jivesoftware Merge Smack 4.1.0-rc2 2015-02-21 18:07:45 +01:00
resources/org.jivesoftware.smack.extensions Improve Message Delivery Receipt (XEP-184) API 2015-01-20 12:43:11 +01:00