diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-05 14:08:32 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-05 14:08:32 -0700 |
| commit | 6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae (patch) | |
| tree | ea302d475b38c694bb147fb3e730ee488b3bf717 /sleekxmpp/plugins/xep_0045.py | |
| parent | ea95811c4c76ae96bc41c4fab48886dd2e85c7a9 (diff) | |
| parent | 148a23579c199d218325c88d7b6f567f42c7a36a (diff) | |
| download | slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.tar.gz slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.tar.bz2 slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.tar.xz slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.zip | |
Merge branch 'master' into develop
Adds hotfix for ANONYMOUS mech support.
Conflicts:
sleekxmpp/__init__.py
Diffstat (limited to 'sleekxmpp/plugins/xep_0045.py')
0 files changed, 0 insertions, 0 deletions