Merge lp://staging/~dangarner/xibo/server162-testfix into lp://staging/xibo/1.6
Proposed by
Dan Garner
Status: | Merged |
---|---|
Merged at revision: | 341 |
Proposed branch: | lp://staging/~dangarner/xibo/server162-testfix |
Merge into: | lp://staging/xibo/1.6 |
Diff against target: |
166 lines (+30/-25) 5 files modified
server/config/config.class.php (+6/-4) server/install.php (+6/-10) server/lib/app/pdoconnect.class.php (+11/-1) server/modules/preview/html-preview.js (+1/-0) server/upgrade.php (+6/-10) |
To merge this branch: | bzr merge lp://staging/~dangarner/xibo/server162-testfix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Xibo Maintainters | Pending | ||
Review via email:
|
To post a comment you must log in.