diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-12-17 21:10:14 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-12-17 21:10:14 +0100 |
commit | eb1cad39a64ca4b38c155985f9faf8b1057a8d65 (patch) | |
tree | dac7706ab34c84bef0ae081635269f112d95f31b /src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | |
parent | 4f0061293e1d8e90d2828deeb6b72d8a2c8bd509 (diff) | |
parent | 2fb31bcc3f9e4920891765ab8e0cf2e33227ea3e (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java')
0 files changed, 0 insertions, 0 deletions