summaryrefslogtreecommitdiff
path: root/docs/getting_started/proxy.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-08 21:14:34 -0800
committerLance Stout <lancestout@gmail.com>2013-01-08 21:14:34 -0800
commitf04f4e4a1a67fa3ec49f6badb02cdc062ebef477 (patch)
treed7a7afd75a30a1e678bdc362e7ee6dc5e353e290 /docs/getting_started/proxy.rst
parent0e7486d7b49fb3f3c6e573ac972dfadc03c7ca08 (diff)
parentb07f1b3bd3dc7b50cd630b8b411bd0a499d801d0 (diff)
downloadslixmpp-f04f4e4a1a67fa3ec49f6badb02cdc062ebef477.tar.gz
slixmpp-f04f4e4a1a67fa3ec49f6badb02cdc062ebef477.tar.bz2
slixmpp-f04f4e4a1a67fa3ec49f6badb02cdc062ebef477.tar.xz
slixmpp-f04f4e4a1a67fa3ec49f6badb02cdc062ebef477.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/getting_started/proxy.rst')
0 files changed, 0 insertions, 0 deletions