1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-19 17:17:57 +01:00
Smack/source/org/jivesoftware
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
..
smack Updated versioning for release (3.4.0) 2014-02-03 01:55:16 +00:00
smackx Merge branch '3.4.0' into master 2014-02-03 12:58:55 +01:00