diff options
author | Lance Stout <lancestout@gmail.com> | 2012-07-27 10:45:52 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-07-27 10:45:52 -0700 |
commit | c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce (patch) | |
tree | 88b7dabe06edbbfeb45403c06628230c18301458 /sleekxmpp/plugins/xep_0258/security_labels.py | |
parent | c9b2cf60431f415584c1d12a7855e0d2ac148ec4 (diff) | |
parent | e3fab66dfb27abdd8aa28a8d15367a490d4b42dd (diff) | |
download | slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.tar.gz slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.tar.bz2 slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.tar.xz slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.zip |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0258/security_labels.py')
0 files changed, 0 insertions, 0 deletions