52ca2e7391
Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java |
||
---|---|---|
.. | ||
java/eu/siacs/conversations | ||
res | ||
AndroidManifest.xml |
52ca2e7391
Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java |
||
---|---|---|
.. | ||
java/eu/siacs/conversations | ||
res | ||
AndroidManifest.xml |