diff options
| author | James Booth <boothj5@gmail.com> | 2015-01-06 21:25:09 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-01-06 21:25:09 +0000 |
| commit | c04b90ce301e9737f23ed81515b2ef4dd15297a8 (patch) | |
| tree | 2e91bac7c056a91e88f40c97ca403360afbc3f45 /src/otr | |
| parent | f7843def2f307286448fda166b425f48aaa6ddf0 (diff) | |
| parent | 99a87a148f13854f4337edf0a6b2a56cae29d5c3 (diff) | |
| download | profani-tty-c04b90ce301e9737f23ed81515b2ef4dd15297a8.tar.gz | |
Merge branch 'master' into chat-sessions
Diffstat (limited to 'src/otr')
0 files changed, 0 insertions, 0 deletions