about summary refs log tree commit diff stats
path: root/tests/otr
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-01-13 00:41:56 +0000
committerJames Booth <boothj5@gmail.com>2015-01-13 00:41:56 +0000
commit21f8b1c4caa354efd3dfe567648916d6e58318a2 (patch)
treec73c73f5e1f37ed7eb198eb5b3d78cfd0e6b00c7 /tests/otr
parent53a825de744a6aa687f695e7e54dea878c4909e1 (diff)
parent0cb548683c906eb7e48ddfccde4b95f671dea5fc (diff)
downloadprofani-tty-21f8b1c4caa354efd3dfe567648916d6e58318a2.tar.gz
Merge remote-tracking branch 'peterlvilim/keyring'
Diffstat (limited to 'tests/otr')
0 files changed, 0 insertions, 0 deletions