diff options
| author | James Booth <boothj5@gmail.com> | 2015-06-13 19:50:53 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-06-13 19:50:53 +0100 |
| commit | b07a7035df8980868421ab27cd62411069885991 (patch) | |
| tree | 68216d42dbf61f339dbc400d509e01539a20fe12 /src/otr/otr.h | |
| parent | eb1f8a499a99d315601016777dd492a8a25a3ea7 (diff) | |
| parent | 6255420b803dabc38cbda44ca13f5c458b85f5d5 (diff) | |
| download | profani-tty-b07a7035df8980868421ab27cd62411069885991.tar.gz | |
Merge branch 'master' into openpgp
Diffstat (limited to 'src/otr/otr.h')
0 files changed, 0 insertions, 0 deletions