diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-12-31 01:29:12 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-12-31 01:29:12 -0500 |
| commit | e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c (patch) | |
| tree | 6a5fe2cee8a3a4bb77d7b99d2d80d9fc7be2511d /docs/getting_started/proxy.rst | |
| parent | d817d64c65c62976481690c0bfc3882621ac0455 (diff) | |
| parent | 03bc38f7e34f6f8f6d79b58477d56df8e488578c (diff) | |
| download | slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.tar.gz slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.tar.bz2 slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.tar.xz slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.zip | |
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'docs/getting_started/proxy.rst')
0 files changed, 0 insertions, 0 deletions