diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-12-15 12:04:14 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-12-15 12:04:14 -0800 |
| commit | 8f9d1bcfe07f3b2302634464eed1e329b71f54ba (patch) | |
| tree | b439366a0edeed47d269e1f9327b88a1d7e113ee /docs/getting_started/proxy.rst | |
| parent | a7a2fd1d5bd770e0df2c2df240acd57fe5e40ea9 (diff) | |
| parent | f6e30edbc4a717b34bbf01d3d0a9fe884c6b37da (diff) | |
| download | slixmpp-8f9d1bcfe07f3b2302634464eed1e329b71f54ba.tar.gz slixmpp-8f9d1bcfe07f3b2302634464eed1e329b71f54ba.tar.bz2 slixmpp-8f9d1bcfe07f3b2302634464eed1e329b71f54ba.tar.xz slixmpp-8f9d1bcfe07f3b2302634464eed1e329b71f54ba.zip | |
Merge branch 'develop-1.1' of github.com:fritzy/SleekXMPP into develop-1.1
Diffstat (limited to 'docs/getting_started/proxy.rst')
0 files changed, 0 insertions, 0 deletions