diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-20 19:45:11 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-20 19:45:11 -0700 |
| commit | 32345969742042aeb92f7b1d06c7ccde1ce12209 (patch) | |
| tree | c07f67313ade5f54e3bbca53fd250b5ecda280b3 /sleekxmpp/plugins/xep_0030/__init__.py | |
| parent | 5820d49cd401a1362a8a675c4b91935adb1240fe (diff) | |
| parent | e86444e5fb731c45cfebeaf54951d916c23d88ec (diff) | |
| download | slixmpp-32345969742042aeb92f7b1d06c7ccde1ce12209.tar.gz slixmpp-32345969742042aeb92f7b1d06c7ccde1ce12209.tar.bz2 slixmpp-32345969742042aeb92f7b1d06c7ccde1ce12209.tar.xz slixmpp-32345969742042aeb92f7b1d06c7ccde1ce12209.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/__init__.py')
0 files changed, 0 insertions, 0 deletions