diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-09-01 13:57:24 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-09-01 13:57:24 -0700 |
| commit | df9ac58d051e195143875e03ce09a3994ade0e00 (patch) | |
| tree | bcead3c0efffa670d2de0dc889aa0708e8ba9446 /sleekxmpp/plugins/xep_0221/media.py | |
| parent | 19a78f63f4a24d7a5ff568608d4323f773d785e2 (diff) | |
| parent | 357406d801dabcac70d2794ac4c61c70655e704b (diff) | |
| download | slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.tar.gz slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.tar.bz2 slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.tar.xz slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0221/media.py')
0 files changed, 0 insertions, 0 deletions