diff options
| author | mathieui <mathieui@mathieui.net> | 2015-10-02 19:07:45 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2015-10-02 19:07:45 +0200 |
| commit | ada9444bf84bd238238c4d22561f69184dd22cdd (patch) | |
| tree | ceb4f86446b4129ec22cb348f1cb1bd7a151e2da /slixmpp/thirdparty/__init__.py | |
| parent | 1100ff1febf7e605e03fd9565bdac5fdaa3bf1e0 (diff) | |
| parent | acc52fd935b7e74919ad748f3a630596f66c62af (diff) | |
| download | slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.gz slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.bz2 slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.xz slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.zip | |
Merge branch 'sleek-merge'
Diffstat (limited to 'slixmpp/thirdparty/__init__.py')
| -rw-r--r-- | slixmpp/thirdparty/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/slixmpp/thirdparty/__init__.py b/slixmpp/thirdparty/__init__.py index fe1056e6..d950f4f9 100644 --- a/slixmpp/thirdparty/__init__.py +++ b/slixmpp/thirdparty/__init__.py @@ -4,3 +4,4 @@ except: from slixmpp.thirdparty.gnupg import GPG from slixmpp.thirdparty.mini_dateutil import tzutc, tzoffset, parse_iso +from slixmpp.thirdparty.orderedset import OrderedSet |