diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-09-13 11:00:58 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-09-13 11:00:58 -0700 |
| commit | 67147570e9be7f51fd079c98f1d6db35fe28563c (patch) | |
| tree | 65d5ba86be1cbc7fc6cebca7a547b5efebceb028 /docs/getting_started/proxy.rst | |
| parent | df9ac58d051e195143875e03ce09a3994ade0e00 (diff) | |
| parent | fb3e6b7e35bb949f73a756ae5be683e2fec12454 (diff) | |
| download | slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.tar.gz slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.tar.bz2 slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.tar.xz slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/getting_started/proxy.rst')
0 files changed, 0 insertions, 0 deletions