iNPUTmice 52ca2e7391 Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification ... Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java		2014-11-11 17:45:16 +01:00
..
main	Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification	2014-11-11 17:45:16 +01:00