diff options
| author | James Booth <boothj5@gmail.com> | 2015-05-03 02:04:21 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-05-03 02:04:21 +0100 |
| commit | bec9b53f103fce5e542a029ab386455443f67b3c (patch) | |
| tree | ea013b3ec908d1ea6695feeccf5a66ef1ae6f9bf /src/xmpp/roster.h | |
| parent | f65c82e112d52aff2c48cf0ceee388537eaaf3bd (diff) | |
| parent | 4e1c2a4f64fd3ed97b9200472f9f627cf16728d4 (diff) | |
| download | profani-tty-bec9b53f103fce5e542a029ab386455443f67b3c.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src/xmpp/roster.h')
0 files changed, 0 insertions, 0 deletions