diff options
author | Lance Stout <lancestout@gmail.com> | 2011-06-01 15:17:04 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-06-01 15:17:04 -0700 |
commit | 788a5b73f9392c49e1bab088d558ea4a337bea2d (patch) | |
tree | 24c68e35cb74ea1bbb286722e4bd72c058e72c56 /sleekxmpp/plugins/xep_0030/disco.py | |
parent | 5ed27bf5f65f03e14da24a60e261a175074cb7aa (diff) | |
parent | 14693233504383d4df0ed092c870d5d7baea6538 (diff) | |
download | slixmpp-788a5b73f9392c49e1bab088d558ea4a337bea2d.tar.gz slixmpp-788a5b73f9392c49e1bab088d558ea4a337bea2d.tar.bz2 slixmpp-788a5b73f9392c49e1bab088d558ea4a337bea2d.tar.xz slixmpp-788a5b73f9392c49e1bab088d558ea4a337bea2d.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/disco.py')
0 files changed, 0 insertions, 0 deletions