← Back to branch summary

~ssweeny/friends/fix-lp1258657

~ssweeny/friends/fix-lp1258657

Viewing all changes in revision 188.5.10.

Committer: Andrew Starr-Bochicchio
Date: 2013-04-16 17:51:32 UTC
mfrom: (160.11.29 trunk-next)
mto: This revision was merged to the branch mainline in revision 218.
Revision ID: a.starr.b@gmail.com-20130416175132-kurn5v12qr2rhfn1

Merge on lp:~super-friends/friends/trunk-next

files added:
friends/tests/data/durlme.dat

friends/tests/data/twitter-retweet.dat

files removed:
friends/shorteners

friends/shorteners/__init__.py

friends/shorteners/base.py

friends/shorteners/isgd.py

friends/shorteners/linkeecom.py

friends/shorteners/ougd.py

friends/shorteners/tinyurlcom.py

files renamed:
friends/shorteners/lookup.py => friends/utils/shorteners.py

files modified:
Makefile

debian/changelog

debian/friends-dispatcher.install

friends/errors.py

friends/main.py

friends/protocols/flickr.py

friends/protocols/twitter.py

friends/service/dispatcher.py

friends/tests/mocks.py

friends/tests/test_account.py

friends/tests/test_authentication.py

friends/tests/test_dispatcher.py

friends/tests/test_facebook.py

friends/tests/test_flickr.py

friends/tests/test_foursquare.py

friends/tests/test_identica.py

friends/tests/test_instagram.py

friends/tests/test_logging.py

friends/tests/test_shortener.py

friends/tests/test_twitter.py

friends/utils/account.py

friends/utils/authentication.py

friends/utils/avatar.py

friends/utils/base.py

friends/utils/cache.py

friends/utils/logging.py

friends/utils/menus.py

friends/utils/notify.py

friends/utils/time.py

tools/debug_live.py

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/friends-dispatcher.install

friends/errors.py

friends/main.py

friends/protocols/flickr.py

friends/protocols/twitter.py

friends/service/dispatcher.py

friends/shorteners/

friends/shorteners/__init__.py

friends/shorteners/base.py

friends/shorteners/isgd.py

friends/shorteners/linkeecom.py

friends/shorteners/ougd.py

friends/shorteners/tinyurlcom.py

friends/tests/data/durlme.dat

friends/tests/data/twitter-retweet.dat

friends/tests/mocks.py

friends/tests/test_account.py

friends/tests/test_authentication.py

friends/tests/test_dispatcher.py

friends/tests/test_facebook.py

friends/tests/test_flickr.py

friends/tests/test_foursquare.py

friends/tests/test_identica.py

friends/tests/test_instagram.py

friends/tests/test_logging.py

friends/tests/test_shortener.py

friends/tests/test_twitter.py

friends/utils/account.py

friends/utils/authentication.py

friends/utils/avatar.py

friends/utils/base.py

friends/utils/cache.py

friends/utils/logging.py

friends/utils/menus.py

friends/utils/notify.py

friends/utils/shorteners.py

friends/utils/time.py

tools/debug_live.py

Older »