summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0060
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-06-14 14:18:40 -0700
committerLance Stout <lancestout@gmail.com>2011-06-14 14:18:40 -0700
commit8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2 (patch)
tree57825ebbe69d844e2caec9a961f98ed841fd02b1 /sleekxmpp/plugins/xep_0060
parent6d59f55fd45a3fa4ec27b45197a95a5aa308f3d2 (diff)
parentdd41a85efcd85bb3a4eb81187041106c65c6aa2d (diff)
downloadslixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.tar.gz
slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.tar.bz2
slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.tar.xz
slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.zip
Merge branch 'develop' into exceptions
Diffstat (limited to 'sleekxmpp/plugins/xep_0060')
0 files changed, 0 insertions, 0 deletions