Ignore:
Timestamp:
Nov 10, 2011, 9:55:59 AM (11 years ago)
Author:
Ralph Meijer <ralphm@…>
Branch:
wokkel-muc-client-support-24
Parents:
154:e016bb963410 (diff), 105:5d8f1609aaf3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge in tip changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wokkel/muc.py

    r154 r155  
    7575            form.makeFields(self.options)
    7676
    77         if form:
     77        if form is not None:
    7878            query.addChild(form.toElement())
    7979
Note: See TracChangeset for help on using the changeset viewer.