Merge lp:~cjohnston/loco-team-portal/edge into lp:loco-team-portal

[Chris Johnston]

[Michael Hall (mhall119)]

I made a minor change to use the 1.0 api instead of beta, otherwise it's good.

review: Approve

=== modified file 'loco_directory/common/launchpad.py'
--- loco_directory/common/launchpad.py	2010-12-21 03:11:18 +0000
+++ loco_directory/common/launchpad.py	2011-02-05 21:14:27 +0000
@@ -76,10 +76,10 @@
     # When this bug is fixed, this can be made cleaner.
     try:
        lp.people[identity].mugshot.open()
-       return "https://edge.launchpad.net/api/beta/~%s/mugshot" % (identity)
+       return "https://launchpad.net/api/beta/~%s/mugshot" % (identity)
     except HTTPError:
        # 404 or some other issue that means we should default to False
-       return "https://edge.launchpad.net/api/beta/ubuntu/mugshot"
+       return "https://launchpad.net/api/beta/ubuntu/mugshot"
 
 def get_user_timezone(username, lp=None):
     timezone = 'UTC'