diff options
| author | Marius Halden <marius.h@lden.org> | 2018-04-19 10:23:08 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2018-04-19 10:23:08 +0200 |
| commit | db02ac8971379f9fee2f3a618bb08b8076d1a83d (patch) | |
| tree | 0e7d46bad6162509300aa73ae6d77e571a5b26d0 /otr.c | |
| parent | 6dc54671e368d03ed447d0fbd2d662af6c36b7fd (diff) | |
| parent | 246b98bbdf221448fd7a638fea04373ed1612de5 (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'otr.c')
0 files changed, 0 insertions, 0 deletions