Paul Schaub 0530449e7e Fix rebase errors		2018-06-09 13:53:04 +02:00
..
main/java/org/jivesoftware/smackx/omemo/signal	Fix rebase errors	2018-06-09 13:53:04 +02:00
test/java/org/jivesoftware/smack/omemo	Temp commit	2018-06-09 13:53:04 +02:00