diff options
author | James Booth <boothj5@gmail.com> | 2014-09-21 16:55:26 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2014-09-21 16:55:26 +0100 |
commit | 5fb05c6d6d67750a9748f99880f5ae3498a9ebd3 (patch) | |
tree | 38a6d1b9fb67bdd2a40e0c6e0e4017864f57ac7c /src/xmpp | |
parent | c343b3ecefdacb5e06ebae9c6338324f2f15e4a1 (diff) | |
parent | 4fc5d0053b777df80d5c8077b80691f46019446d (diff) | |
download | profani-tty-5fb05c6d6d67750a9748f99880f5ae3498a9ebd3.tar.gz |
Merge branch 'master' into caps
Diffstat (limited to 'src/xmpp')
0 files changed, 0 insertions, 0 deletions