Merge lp://qastaging/~ken-vandine/telegram-app/lp1554621 into lp://qastaging/telegram-app
Proposed by
Ken VanDine
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 165 | ||||
| Proposed branch: | lp://qastaging/~ken-vandine/telegram-app/lp1554621 | ||||
| Merge into: | lp://qastaging/telegram-app | ||||
| Diff against target: |
137 lines (+13/-13) 10 files modified
telegram/app/qml/AccountMessageList.qml (+1/-1) telegram/app/qml/AccountSendMessage.qml (+1/-1) telegram/app/qml/AccountSettings.qml (+1/-1) telegram/app/qml/MediaImport.qml (+2/-2) telegram/app/qml/PickerPage.qml (+1/-1) telegram/app/qml/PreviewPage.qml (+1/-1) telegram/app/qml/ProfilePage.qml (+1/-1) telegram/app/qml/components/ContactImport.qml (+2/-2) telegram/app/qml/components/MediaImport.qml (+2/-2) telegram/app/qml/telegram.qml (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~ken-vandine/telegram-app/lp1554621 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jin (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Bumped Ubuntu.Content imports to 1.3, as well as Ubuntu.Components in the same files. The UITK doesn't handle mixed version imports well.
Description of the change
Bumped Ubuntu.Content imports to 1.3, as well as Ubuntu.Components in the same files. The UITK doesn't handle mixed version imports well.
To post a comment you must log in.
Revision history for this message
| Jin (jindallo) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Code looks good to me,
and this patch is under testing by sanity test from me,
will approve this merge proposal after passed.