about summary refs log tree commit diff stats
path: root/src/xmpp
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2013-12-10 00:17:14 +0000
committerJames Booth <boothj5@gmail.com>2013-12-10 00:17:14 +0000
commitce75d5883023233d6c63490a75fae3a4ca263555 (patch)
treed2ac24c2a3551704bde78c3fd8b3b4addf155f8a /src/xmpp
parentd17cd3f5739e08a994bf0b260a8d196e4c27d542 (diff)
parente27061b131d9ec9e37690e4759d7264d0393a547 (diff)
downloadprofani-tty-ce75d5883023233d6c63490a75fae3a4ca263555.tar.gz
Merge branch 'master' into refactor
Diffstat (limited to 'src/xmpp')
0 files changed, 0 insertions, 0 deletions