summaryrefslogtreecommitdiff
path: root/docs/getting_started/proxy.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-19 00:15:21 -0700
committerLance Stout <lancestout@gmail.com>2012-10-19 00:15:21 -0700
commit0d448b82214ed8bed3477db375799ae8399d0393 (patch)
treecad4b16d9c1622d858d70e6aae4dece230566734 /docs/getting_started/proxy.rst
parent77f2a339e1626501a1df388050f09342d7bbcd1d (diff)
parente6c95f0a2acfd56ad47f60d9576a0db5458ed118 (diff)
downloadslixmpp-0d448b82214ed8bed3477db375799ae8399d0393.tar.gz
slixmpp-0d448b82214ed8bed3477db375799ae8399d0393.tar.bz2
slixmpp-0d448b82214ed8bed3477db375799ae8399d0393.tar.xz
slixmpp-0d448b82214ed8bed3477db375799ae8399d0393.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/getting_started/proxy.rst')
0 files changed, 0 insertions, 0 deletions