diff options
author | James Booth <boothj5@gmail.com> | 2016-07-18 22:55:05 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2016-07-18 22:55:05 +0100 |
commit | 269b8ce83225d98f683ff12f06847ea224788f06 (patch) | |
tree | b12ea3950237330415e25721aa5f247426e316fd /src/xmpp/roster.h | |
parent | 7d742f704fd495fc6b4cda85e0ee0f517bb77797 (diff) | |
parent | feb50ea41174af94d67332cd9baf95506e1483a7 (diff) | |
download | profani-tty-269b8ce83225d98f683ff12f06847ea224788f06.tar.gz |
Merge branch 'master' into python3
Diffstat (limited to 'src/xmpp/roster.h')
0 files changed, 0 insertions, 0 deletions