Merge lp://staging/~abreu-alexandre/unity-webapps-qml/backport-14-10 into lp://staging/unity-webapps-qml
Proposed by
Alexandre Abreu
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~abreu-alexandre/unity-webapps-qml/backport-14-10 |
| Merge into: | lp://staging/unity-webapps-qml |
| Diff against target: |
161 lines (+49/-18) (has conflicts) 4 files modified
debian/control (+8/-0) src/Ubuntu/UnityWebApps/UnityWebApps.qml (+9/-1) src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js (+7/-0) src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js (+25/-17) Text conflict in debian/control Text conflict in src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/unity-webapps-qml/backport-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-02.
Commit message
backport getpeers content hub fix
backport content hub issue on desktop webapp startup,
backport oxide integration fixes,
Description of the change
backport getpeers content hub fix
backport content hub issue on desktop webapp startup,
backport oxide integration fixes,
To post a comment you must log in.
Unmerged revisions
- 135. By Alexandre Abreu
-
backport oxide integration
- 134. By Alexandre Abreu
-
backport desktop fix for content hub; backport getpeers fix
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
