Merge branch 'master' into develop

This commit is contained in:
Lance Stout 2012-07-23 01:52:55 -07:00
commit a3ec1af205

View file

@ -68,7 +68,7 @@ class XEP_0184(BasePlugin):
ack['to'] = msg['from']
ack['from'] = msg['to']
ack['receipt'] = msg['id']
ack['id'] = self.xmpp.new_id()
ack['id'] = msg['id']
ack.send()
def _handle_receipt_received(self, msg):