jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'docs' into develop

Browse Source 
Conflicts:
	docs/_static/haiku.css
	docs/_static/header.png
	docs/conf.py
	docs/getting_started/muc.rst
	docs/index.rst
	examples/muc.py
This commit is contained in:
Lance Stout
2012-01-18 15:04:33 -08:00
parent 1e01903072 3575084640
commit 72e1ab47fc
9 changed files with 450 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/muc.py
View File

@@ -76,8 +76,13 @@ class MUCBot(sleekxmpp.ClientXMPP):
event does not provide any additional
data.
"""
<<<<<<< HEAD
self.getRoster()
self.sendPresence()
=======
self.get_roster()
self.send_presence()
>>>>>>> docs
self.plugin['xep_0045'].joinMUC(self.room,
self.nick,
# If a room password is needed, use: