1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-24 11:38:00 +01:00
Smack/smack-extensions/src/main/java/org/jivesoftware
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
..
smack/extensions Enable OSGi compliance via 'DynamicImport-Package: *' 2015-01-03 13:14:02 +01:00
smackx Merge Smack 4.1.0-rc2 2015-02-21 18:07:45 +01:00