diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-08-02 13:47:37 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-08-02 13:47:37 -0700 |
| commit | f81d5e4bd656fb64dd7f4285afa26e452a869a63 (patch) | |
| tree | de758a6cbc60032ce40351dacda68588fab432ff /docs/getting_started/proxy.rst | |
| parent | 2f65fdbc76e46a3468d46bec7f2655a053cb5039 (diff) | |
| parent | 2324c90232aa7815f130761f1215704b391415fb (diff) | |
| download | slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.tar.gz slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.tar.bz2 slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.tar.xz slixmpp-f81d5e4bd656fb64dd7f4285afa26e452a869a63.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/getting_started/proxy.rst')
0 files changed, 0 insertions, 0 deletions