diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-08-24 11:51:03 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-08-24 11:51:03 -0700 |
| commit | 19a78f63f4a24d7a5ff568608d4323f773d785e2 (patch) | |
| tree | 5cffabf943f3aeba1b5763a84e28caf0ed3ab1d8 /sleekxmpp/plugins/xep_0191/blocking.py | |
| parent | e20610ab80b1edf3be84a2a5a0fafc22a35d3aee (diff) | |
| parent | c7ec6a72cda41c7dbbdd4193d795b5dd8df4843f (diff) | |
| download | slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.tar.gz slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.tar.bz2 slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.tar.xz slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0191/blocking.py')
0 files changed, 0 insertions, 0 deletions