about summary refs log tree commit diff stats
path: root/src/xmpp
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-04-30 23:38:28 +0100
committerJames Booth <boothj5@gmail.com>2015-04-30 23:38:28 +0100
commit0bd642edf8d943485871082c2678b0662e1dd5db (patch)
treeb5ed09aceb749904eaa546333130c804f9f87f66 /src/xmpp
parenta3a4b6267b02d69761e64403aa131553c946fa96 (diff)
parente11e55e31abced2f4e7fa332298485562adaf1ef (diff)
downloadprofani-tty-0bd642edf8d943485871082c2678b0662e1dd5db.tar.gz
Merge branch 'master' into pgp
Diffstat (limited to 'src/xmpp')
0 files changed, 0 insertions, 0 deletions