diff options
| author | James Booth <boothj5@gmail.com> | 2015-05-03 02:35:15 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-05-03 02:35:15 +0100 |
| commit | 0f3bece9e2238a0d13731f4415dca573aec15415 (patch) | |
| tree | 01fa70336c1d767e53b28579e93d0e452689ddfe /src/otr/otr.c | |
| parent | bec9b53f103fce5e542a029ab386455443f67b3c (diff) | |
| parent | ff867e7f2bdfbd8856bd2a010e9d19b9a429a239 (diff) | |
| download | profani-tty-0f3bece9e2238a0d13731f4415dca573aec15415.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src/otr/otr.c')
0 files changed, 0 insertions, 0 deletions