about summary refs log tree commit diff stats
path: root/src/xmpp
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-06-02 20:32:07 +0100
committerJames Booth <boothj5@gmail.com>2015-06-02 20:32:07 +0100
commita3693cfbe744c6ba8274b56a437f1faaaad414bf (patch)
tree6938c09c2f9dfc831a710f6e0dc9b2f93b500a21 /src/xmpp
parent06fe9bec371f99a29c7de1858fbefe5e10c56882 (diff)
parentf0f3a739f4f6963d9ed3300f4b9ef8116ec39ba3 (diff)
downloadprofani-tty-a3693cfbe744c6ba8274b56a437f1faaaad414bf.tar.gz
Merge branch 'master' into openpgp
Diffstat (limited to 'src/xmpp')
0 files changed, 0 insertions, 0 deletions