Florian Schmaus a48e8ef843 Merge branch '4.2'		2018-02-21 20:13:05 +01:00
..
src/main/java/org/jivesoftware	Merge branch '4.2'	2018-02-21 20:13:05 +01:00
build.gradle	Don't let smack-android depend on smack-omemo(-signal)	2017-10-27 20:54:06 +02:00