diff options
| author | lookshe <github@lookshe.org> | 2016-04-06 00:09:38 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-06 00:09:38 +0200 |
| commit | 1e1f7f419ecbe9db44acb84fd06c7b889d1af475 (patch) | |
| tree | 82a389561691afa508433d338e3f87aa6c8a5c7b /src/main/java/de/thedevstack/conversationsplus/ui/TrustKeysActivity.java | |
| parent | 0beb3ca30b31f07e374b870e6a659256f6960170 (diff) | |
| parent | aa9b5036d26f27b9d1f0c8bacd934b5d5dd09137 (diff) | |
Merge branch 'trz/rebase' into trz/rename (skip beta logo)
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/TrustKeysActivity.java')
0 files changed, 0 insertions, 0 deletions