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

Proposed by Tim Bentley
Status: Merged
Merged at revision: 2815
Proposed branch: lp://qastaging/~trb143/openlp/media2018a
Merge into: lp://qastaging/openlp
Diff against target: 152 lines (+54/-26)
3 files modified
openlp/core/ui/media/mediacontroller.py (+3/-23)
openlp/core/ui/media/vlcplayer.py (+10/-1)
tests/functional/openlp_core/api/endpoint/test_controller.py (+41/-2)
To merge this branch: bzr merge lp://qastaging/~trb143/openlp/media2018a
Reviewer Review Type Date Requested Status
Tomas Groth Approve
Review via email: mp+341592@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) :
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.