diff options
| author | James Booth <boothj5@gmail.com> | 2014-09-30 20:46:26 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-09-30 20:46:26 +0100 |
| commit | bca5a5f78db25cae450b9f89912b4674cbf5e368 (patch) | |
| tree | bfd1bfcf09cf03250c5cd65ee7e8375ac97b1e33 /src/xmpp/roster.h | |
| parent | 0365e88b7b461123f213beea43a9f55524bd9688 (diff) | |
| parent | fbeb107cbeff39a04b26daf60c70f98c7c58cb5c (diff) | |
| download | profani-tty-bca5a5f78db25cae450b9f89912b4674cbf5e368.tar.gz | |
Merge branch 'master' into muc_roles
Conflicts: .gitignore
Diffstat (limited to 'src/xmpp/roster.h')
0 files changed, 0 insertions, 0 deletions