Merge lp://qastaging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot into lp://qastaging/ubuntu-terminal-app
Proposed by
spookje
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | spookje | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://qastaging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot | ||||
| Merge into: | lp://qastaging/ubuntu-terminal-app | ||||
| Diff against target: |
941 lines (+657/-0) (has conflicts) 5 files modified
po/ast.po (+101/-0) po/de.po (+158/-0) po/fi.po (+184/-0) po/fr.po (+17/-0) po/hr.po (+197/-0) Text conflict in po/ast.po Text conflict in po/de.po Text conflict in po/fi.po Text conflict in po/fr.po Text conflict in po/hr.po |
||||
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Terminal Developers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
