1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-12-23 13:07:59 +01:00
Smack/test
Florian Schmaus b18a43920a Merge branch '3.4.0' into master
Conflicts:
	source/org/jivesoftware/smack/SmackConfiguration.java
2014-02-03 12:58:55 +01:00
..
config SMACK-389 Plugable compression framework 2013-02-26 09:26:41 +00:00
org/jivesoftware Merge branch '3.4.0' into master 2014-02-03 12:58:55 +01:00