Florian Schmaus a48e8ef843 Merge branch '4.2'		2018-02-21 20:13:05 +01:00
..
src	Merge branch '4.2'	2018-02-21 20:13:05 +01:00
.gitignore	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
build.gradle	Add OMEMO support	2017-06-02 13:40:10 +02:00