Merge lp://staging/~dangarner/xibo/server-668068 into lp://staging/xibo/1.2
Proposed by
Dan Garner
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 202 | ||||||||
| Proposed branch: | lp://staging/~dangarner/xibo/server-668068 | ||||||||
| Merge into: | lp://staging/xibo/1.2 | ||||||||
| Diff against target: |
91 lines (+22/-7) 3 files modified
server/lib/data/display.data.class.php (+11/-5) server/lib/data/displaygroup.data.class.php (+9/-0) server/lib/pages/display.class.php (+2/-2) |
||||||||
| To merge this branch: | bzr merge lp://staging/~dangarner/xibo/server-668068 | ||||||||
| 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
