summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0060
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-07-27 19:36:04 -0700
committerLance Stout <lancestout@gmail.com>2011-07-27 19:36:04 -0700
commitd7fe724145c2e01d1028dab773fb49414c6856dd (patch)
tree460331e5949b92637c79275aed001c85125f7afe /sleekxmpp/plugins/xep_0060
parent20df6348a4c8262a40578d84c934f9a15431d925 (diff)
parente022b2a36c342b6a83d7c7f0a39dfb851cdfd2de (diff)
downloadslixmpp-d7fe724145c2e01d1028dab773fb49414c6856dd.tar.gz
slixmpp-d7fe724145c2e01d1028dab773fb49414c6856dd.tar.bz2
slixmpp-d7fe724145c2e01d1028dab773fb49414c6856dd.tar.xz
slixmpp-d7fe724145c2e01d1028dab773fb49414c6856dd.zip
Merge branch 'develop' into exceptions
Diffstat (limited to 'sleekxmpp/plugins/xep_0060')
0 files changed, 0 insertions, 0 deletions