diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-12-18 10:33:33 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-12-18 10:33:33 -0800 |
| commit | 29c049612a181e480371f3a686170a87af1e9f98 (patch) | |
| tree | dbb745d4f90296ccda720272b5b0c7f57252e147 /docs/api/xmlstream/filesocket.rst | |
| parent | f431bbfca2b9862f954e25d7dd234a9131bc2ee1 (diff) | |
| parent | ed481857326606603f70ef06dbd5a4b48d1b9510 (diff) | |
| download | slixmpp-29c049612a181e480371f3a686170a87af1e9f98.tar.gz slixmpp-29c049612a181e480371f3a686170a87af1e9f98.tar.bz2 slixmpp-29c049612a181e480371f3a686170a87af1e9f98.tar.xz slixmpp-29c049612a181e480371f3a686170a87af1e9f98.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/api/xmlstream/filesocket.rst')
0 files changed, 0 insertions, 0 deletions