diff options
| author | lookshe <github@lookshe.org> | 2016-03-30 01:02:32 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-30 01:02:32 +0200 |
| commit | a8f667e11fdf801a1bdb7f6977440d1da5edb4fd (patch) | |
| tree | 8698ba5a380556b0d2832777ccf5fda0b6602780 /src/main/java/eu/siacs/conversations/crypto/PgpEngine.java | |
| parent | 5021c1c194af85947c413f15e2ed8d28e4594b8a (diff) | |
| parent | 51d1d2226a2f41affdb79fdcffad25731077bafd (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/PgpEngine.java')
0 files changed, 0 insertions, 0 deletions