diff options
author | James Booth <boothj5@gmail.com> | 2015-05-19 22:38:56 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-05-19 22:38:56 +0100 |
commit | 22e322e2f117fc6074706c28e5fdb193f951583e (patch) | |
tree | f9162d784365e21236d5b99c4ad412f59a0c460f /src/xmpp/connection.c | |
parent | 9ce25c33b03b7ff8ca8cd1cc52d8b7d24d125703 (diff) | |
parent | 8d8b651cf293e18dd2c1f8fd8aad257e76d3c76a (diff) | |
download | profani-tty-22e322e2f117fc6074706c28e5fdb193f951583e.tar.gz |
Merge branch 'master' into stabber-tests
Diffstat (limited to 'src/xmpp/connection.c')
0 files changed, 0 insertions, 0 deletions