diff options
author | James Booth <boothj5@gmail.com> | 2015-06-02 20:32:07 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-06-02 20:32:07 +0100 |
commit | a3693cfbe744c6ba8274b56a437f1faaaad414bf (patch) | |
tree | 6938c09c2f9dfc831a710f6e0dc9b2f93b500a21 /src/xmpp | |
parent | 06fe9bec371f99a29c7de1858fbefe5e10c56882 (diff) | |
parent | f0f3a739f4f6963d9ed3300f4b9ef8116ec39ba3 (diff) | |
download | profani-tty-a3693cfbe744c6ba8274b56a437f1faaaad414bf.tar.gz |
Merge branch 'master' into openpgp
Diffstat (limited to 'src/xmpp')
0 files changed, 0 insertions, 0 deletions