diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-20 21:13:06 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-20 21:13:06 -0700 |
| commit | 546066d67713db06400f4c74814875d47d98670e (patch) | |
| tree | f187cb39a9f6d015b93e47c0d2bb711089217cb8 /docs/getting_started/proxy.rst | |
| parent | 32345969742042aeb92f7b1d06c7ccde1ce12209 (diff) | |
| parent | 7a112f25237fcae3a99d327f56d4e01a94fd6e86 (diff) | |
| download | slixmpp-546066d67713db06400f4c74814875d47d98670e.tar.gz slixmpp-546066d67713db06400f4c74814875d47d98670e.tar.bz2 slixmpp-546066d67713db06400f4c74814875d47d98670e.tar.xz slixmpp-546066d67713db06400f4c74814875d47d98670e.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/getting_started/proxy.rst')
0 files changed, 0 insertions, 0 deletions