Merge lp://staging/~abreu-alexandre/unity-webapps-qml/content-hub-getpeers-failure-14-10 into lp://staging/unity-webapps-qml
Proposed by
Alexandre Abreu
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~abreu-alexandre/unity-webapps-qml/content-hub-getpeers-failure-14-10 | ||||
| Merge into: | lp://staging/unity-webapps-qml | ||||
| Diff against target: |
15 lines (+4/-0) (has conflicts) 1 file modified
src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js (+4/-0) Text conflict in src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js |
||||
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/unity-webapps-qml/content-hub-getpeers-failure-14-10 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| WebApps | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-12-05.
Commit message
Fix content hub getpeers()
Description of the change
Fix content hub getpeers()
To post a comment you must log in.
Unmerged revisions
- 134. By Alexandre Abreu
-
BAckport fix content hub api getPeers()
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
