about summary refs log tree commit diff stats
path: root/src/xmpp/iq.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2014-12-29 15:29:28 +0000
committerJames Booth <boothj5@gmail.com>2014-12-29 15:29:28 +0000
commitaebee209b2698eba40b1b220e162f87db23cc838 (patch)
treef5396a26e24e5fbee16a20a832284304dfa080c6 /src/xmpp/iq.c
parent1c35321cb315b7ce5bee3f5f281df103b0bc1f77 (diff)
parent1dca023c9f56a8c1a30d1b8de08dc9878b161bf6 (diff)
downloadprofani-tty-aebee209b2698eba40b1b220e162f87db23cc838.tar.gz
Merge remote-tracking branch 'incertia/connect-default'
Conflicts:
	CHANGELOG
Diffstat (limited to 'src/xmpp/iq.c')
0 files changed, 0 insertions, 0 deletions