summaryrefslogtreecommitdiff
path: root/docs/architecture.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-12-15 12:03:52 -0800
committerLance Stout <lancestout@gmail.com>2011-12-15 12:03:52 -0800
commita7a2fd1d5bd770e0df2c2df240acd57fe5e40ea9 (patch)
treec1e4f63365e92a01c87f82b7607a0ac9a7ecd8d9 /docs/architecture.rst
parentdcb0d8b00ec9d81f75b9b7f2cbd8fb785eafa507 (diff)
parentd496417deb5a2c87fe8ad639e82d2b19ce94fc30 (diff)
downloadslixmpp-a7a2fd1d5bd770e0df2c2df240acd57fe5e40ea9.tar.gz
slixmpp-a7a2fd1d5bd770e0df2c2df240acd57fe5e40ea9.tar.bz2
slixmpp-a7a2fd1d5bd770e0df2c2df240acd57fe5e40ea9.tar.xz
slixmpp-a7a2fd1d5bd770e0df2c2df240acd57fe5e40ea9.zip
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'docs/architecture.rst')
0 files changed, 0 insertions, 0 deletions