diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-01-04 22:11:21 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-01-04 22:11:21 +0100 |
| commit | 40afa7c9ee13a7ffee6417fba9e7dda39c087165 (patch) | |
| tree | 880e8e50eab234c08e73d6ac8f97f4ded43feb6e /src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | |
| parent | eb1cad39a64ca4b38c155985f9faf8b1057a8d65 (diff) | |
| parent | 65be0f1b2dd071c6629f36cc6ad392c5100b8f26 (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