]> jfr.im git - z_archive/twitter.git/commitdiff
projects / z_archive / twitter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1719c9 1bcedcd)
Merge branch 'master' into py3-2
authorMike Verdone <redacted>
Wed, 2 Mar 2011 21:40:15 +0000 (22:40 +0100)
committerMike Verdone <redacted>
Wed, 2 Mar 2011 21:40:15 +0000 (22:40 +0100)
Conflicts:
twitter/api.py
twitter/oauth.py


Trivial merge
twitter API client, here for my changes to twitterbot - from https://github.com/python-twitter-tools/twitter