diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 02:27:01 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 02:27:01 +0100 |
| commit | 6de11f38eaeb758692e0690f7150556d46d1f674 (patch) | |
| tree | 84dd63dd0e67eca354f3067c36f6e7c274574442 /src/main/java/de/thedevstack/conversationsplus/ui/TrustKeysActivity.java | |
| parent | b99714161b48b276242d484cdeddfb3ef8aef4c4 (diff) | |
| parent | 25d3aba4d7dad3edffb92a06b2b018df7ca9b177 (diff) | |
Merge branch 'trz/rebase' (early part) into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/TrustKeysActivity.java')
0 files changed, 0 insertions, 0 deletions