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

Merge branch 'master' into develop

Browse Source 
Conflicts:
	sleekxmpp/thirdparty/__init__.py
This commit is contained in:
Lance Stout
2012-07-31 21:33:19 -07:00
parent 44ce01a70b 1383ca19b5
commit 06a9d9fc30
45 changed files with 1228 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sleekxmpp/thirdparty/__init__.py vendored
View File

@@ -8,5 +8,5 @@ try:
except:
from sleekxmpp.thirdparty.gnupg import GPG
from sleekxmpp.thirdparty import suelta, socks
from sleekxmpp.thirdparty import socks
from sleekxmpp.thirdparty.mini_dateutil import tzutc, tzoffset, parse_iso