diff options
| author | James Booth <boothj5@gmail.com> | 2015-05-03 01:30:14 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-05-03 01:30:14 +0100 |
| commit | d3f4347513c23fe427c82aec7e115f5c5fec99a5 (patch) | |
| tree | f7df18266907c97a16e6400ddacad3fbd53cd512 /tests/pgp | |
| parent | 79d21d4cd27c18ac982c8a383d8d89346e98aea5 (diff) | |
| parent | 530c060d2aa578bfbb9969ba6e56340830138dfc (diff) | |
| download | profani-tty-d3f4347513c23fe427c82aec7e115f5c5fec99a5.tar.gz | |
Merge branch 'master' into pgp
Conflicts: src/xmpp/message.c
Diffstat (limited to 'tests/pgp')
0 files changed, 0 insertions, 0 deletions