Merge lp://qastaging/~lizthegrey/pithos/pandora-api-28 into lp://qastaging/~kevin-mehall/pithos/trunk
Proposed by
Liz Fong-Jones
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 136 | ||||
| Proposed branch: | lp://qastaging/~lizthegrey/pithos/pandora-api-28 | ||||
| Merge into: | lp://qastaging/~kevin-mehall/pithos/trunk | ||||
| Diff against target: |
917 lines (+360/-532) 2 files modified
pithos/pandora/pandora.py (+1/-1) pithos/pandora/pandora_keys.py (+359/-531) |
||||
| To merge this branch: | bzr merge lp://qastaging/~lizthegrey/pithos/pandora-api-28 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kevin Mehall | Pending | ||
|
Review via email:
|
|||
Description of the change
Unbreaks Pandora API.
To post a comment you must log in.
Revision history for this message
| Liz Fong-Jones (lizthegrey) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Note: as per discussion on IRC, quickmix is still broken.