Merge lp://qastaging/~dangarner/xibo/server162-testfix2 into lp://qastaging/xibo/1.7
Proposed by
Dan Garner
| Status: | Merged |
|---|---|
| Merged at revision: | 338 |
| Proposed branch: | lp://qastaging/~dangarner/xibo/server162-testfix2 |
| Merge into: | lp://qastaging/xibo/1.7 |
| Diff against target: |
551 lines (+264/-83) (has conflicts) 9 files modified
default.pot (+8/-0) server/config/config.class.php (+12/-2) server/install.php (+12/-0) server/lib/app/pdoconnect.class.php (+11/-1) server/manual/content/admin/release_notes_1.6.2.php (+162/-76) server/modules/preview/HtmlTemplateForGetResource.html (+4/-0) server/modules/preview/html-preview.js (+12/-4) server/modules/preview/xibo-text-render.js (+31/-0) server/upgrade.php (+12/-0) Contents conflict in default.mo Text conflict in default.pot Text conflict in server/config/config.class.php Text conflict in server/install.php Text conflict in server/manual/content/admin/release_notes_1.6.2.php Text conflict in server/modules/preview/HtmlTemplateForGetResource.html Text conflict in server/modules/preview/html-preview.js Text conflict in server/modules/preview/xibo-text-render.js Text conflict in server/upgrade.php |
| To merge this branch: | bzr merge lp://qastaging/~dangarner/xibo/server162-testfix2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Xibo Maintainters | 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
