summaryrefslogtreecommitdiff
path: root/docs/getting_started/muc.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-13 11:12:41 -0700
committerLance Stout <lancestout@gmail.com>2012-08-13 11:12:41 -0700
commit04dc68f5f63508a512e7fbebc873a85961fdb005 (patch)
treec9f90aa9c0cccdac7d2370e156c1cc2a9d702718 /docs/getting_started/muc.rst
parent5c25208fb53e5fd08be032ce96307302d18ab27b (diff)
parent92be0514504747811af0b4f160fe8f2b63bf454d (diff)
downloadslixmpp-04dc68f5f63508a512e7fbebc873a85961fdb005.tar.gz
slixmpp-04dc68f5f63508a512e7fbebc873a85961fdb005.tar.bz2
slixmpp-04dc68f5f63508a512e7fbebc873a85961fdb005.tar.xz
slixmpp-04dc68f5f63508a512e7fbebc873a85961fdb005.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/getting_started/muc.rst')
0 files changed, 0 insertions, 0 deletions