diff options
author | Lance Stout <lancestout@gmail.com> | 2011-06-15 10:56:33 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-06-15 10:56:33 -0700 |
commit | 4efd41f1ba679348487e1e88b7426830e92a9f9b (patch) | |
tree | 93586c2f232374f61c2a2ae82dc90f18e817a181 /sleekxmpp/plugins/xep_0060.py | |
parent | 5d11ab269d721a6360420798cfa5243e63bf8013 (diff) | |
parent | 58aa944a5e07032fc8d5770347f82e7c2ce6c948 (diff) | |
download | slixmpp-4efd41f1ba679348487e1e88b7426830e92a9f9b.tar.gz slixmpp-4efd41f1ba679348487e1e88b7426830e92a9f9b.tar.bz2 slixmpp-4efd41f1ba679348487e1e88b7426830e92a9f9b.tar.xz slixmpp-4efd41f1ba679348487e1e88b7426830e92a9f9b.zip |
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/plugins/xep_0060.py')
0 files changed, 0 insertions, 0 deletions