diff options
author | James Booth <boothj5@gmail.com> | 2015-06-15 22:03:25 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-06-15 22:03:25 +0100 |
commit | de4745059465f0baa21b4c3e721971cf40cd0d87 (patch) | |
tree | 02303feb3f05288dbbe8449614ac15299d899938 /src/otr | |
parent | c76692516a65af35249e93071a6478fd9d799fff (diff) | |
parent | 6097a5bade7fdcd333b8127c36d31024ae29284b (diff) | |
download | profani-tty-de4745059465f0baa21b4c3e721971cf40cd0d87.tar.gz |
Merge branch 'master' into openpgp
Diffstat (limited to 'src/otr')
0 files changed, 0 insertions, 0 deletions