OpenLP

Merge lp://qastaging/~trb143/openlp/fixwebabend into lp://qastaging/openlp

  1. fixwebabend
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: 2793
Proposed branch: lp://qastaging/~trb143/openlp/fixwebabend
Merge into: lp://qastaging/openlp
Diff against target: 150 lines (+52/-19)
6 files modified
openlp/core/api/http/server.py (+8/-7)
openlp/core/api/websockets.py (+7/-6)
openlp/core/ui/mainwindow.py (+2/-3)
tests/functional/openlp_core/api/http/test_http.py (+17/-1)
tests/functional/openlp_core/api/test_websockets.py (+17/-1)
tests/functional/openlp_core/ui/test_mainwindow.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~trb143/openlp/fixwebabend
Reviewer Review Type Date Requested Status
Phill Approve
Raoul Snyman Approve
Review via email: mp+334632@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2017-12-02.

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Phill (phill-ridout) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.