Skip to content
Commit 52ca2e73 authored by iNPUTmice's avatar iNPUTmice
Browse files

Merge branch 'feature/otr_verification' of... 

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
parents d1bf9a3f 8cb97f51
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment