diff options
| author | James Booth <boothj5@gmail.com> | 2015-05-04 00:43:36 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-05-04 00:43:36 +0100 |
| commit | bab4da039a69b4a51d7d909eb63c4667807c900c (patch) | |
| tree | 46cfdf7835c9159806126d1285c67f9155f15b91 /src/xmpp/connection.c | |
| parent | 0f3bece9e2238a0d13731f4415dca573aec15415 (diff) | |
| parent | c3d2a7e9377c9d16f1ee4ea57c6e0c1f78b5ac6e (diff) | |
| download | profani-tty-bab4da039a69b4a51d7d909eb63c4667807c900c.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src/xmpp/connection.c')
0 files changed, 0 insertions, 0 deletions