Merge lp:~cmiller/ubuntuone-android-music/last-fm-scrobbling into lp:~scottwferg/ubuntuone-android-music/last-fm-scrobbling
Proposed by
Chad Miller
Status: | Merged |
---|---|
Merged at revision: | 448 |
Proposed branch: | lp:~cmiller/ubuntuone-android-music/last-fm-scrobbling |
Merge into: | lp:~scottwferg/ubuntuone-android-music/last-fm-scrobbling |
Diff against target: |
47 lines (+14/-2) 3 files modified
assets/html/en/index.html (+12/-0) res/values/strings.xml (+1/-1) src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java (+1/-1) |
To merge this branch: | bzr merge lp:~cmiller/ubuntuone-android-music/last-fm-scrobbling |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott Ferguson | Approve | ||
Ubuntu One hackers | Pending | ||
Review via email: mp+37792@code.launchpad.net |
To post a comment you must log in.
Merged in the changes