diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-03 18:35:01 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-03 18:35:01 -0700 |
| commit | 9591cd3a7e94a663675d97b1db93c2c585d948dc (patch) | |
| tree | b9e067447d7a269651b0b4e60fc7255b127aed79 /sleekxmpp/stanza/__init__.py | |
| parent | db92fa23303f1115ef8bf938efb6d686d9c3fa0a (diff) | |
| parent | afeb8a679a9895726eea5669b73c83d57bb03dff (diff) | |
| download | slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.tar.gz slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.tar.bz2 slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.tar.xz slixmpp-9591cd3a7e94a663675d97b1db93c2c585d948dc.zip | |
Merge branch 'stream_features' into develop
Diffstat (limited to 'sleekxmpp/stanza/__init__.py')
| -rw-r--r-- | sleekxmpp/stanza/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/stanza/__init__.py b/sleekxmpp/stanza/__init__.py index dbf7b86f..4bd37dc5 100644 --- a/sleekxmpp/stanza/__init__.py +++ b/sleekxmpp/stanza/__init__.py @@ -8,7 +8,8 @@ from sleekxmpp.stanza.error import Error -from sleekxmpp.stanza.stream_error import StreamError from sleekxmpp.stanza.iq import Iq from sleekxmpp.stanza.message import Message from sleekxmpp.stanza.presence import Presence +from sleekxmpp.stanza.stream_features import StreamFeatures +from sleekxmpp.stanza.stream_error import StreamError |