diff options
| author | James Booth <boothj5@gmail.com> | 2015-06-14 00:02:00 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-06-14 00:02:00 +0100 |
| commit | 10a5f29023b5ace2358b57da86038de4a5d47f5f (patch) | |
| tree | 08b97d43b7348632e20ee1f44cd8699b4bbe6815 /src/otr | |
| parent | b07a7035df8980868421ab27cd62411069885991 (diff) | |
| parent | e50461a897d225a60b08e928074753230fc4ede6 (diff) | |
| download | profani-tty-10a5f29023b5ace2358b57da86038de4a5d47f5f.tar.gz | |
Merge branch 'master' into openpgp
Diffstat (limited to 'src/otr')
0 files changed, 0 insertions, 0 deletions