Merge lp:~phill-ridout/openlp/path_fixes into lp:openlp
Proposed by
Phill
Status: | Merged |
---|---|
Approved by: | Raoul Snyman |
Approved revision: | 2883 |
Merged at revision: | 2881 |
Proposed branch: | lp:~phill-ridout/openlp/path_fixes |
Merge into: | lp:openlp |
Diff against target: |
169 lines (+26/-30) 6 files modified
openlp/core/common/json.py (+13/-4) openlp/core/common/settings.py (+1/-1) openlp/core/display/html/display.js (+4/-18) openlp/core/display/window.py (+2/-2) openlp/core/lib/theme.py (+5/-4) openlp/plugins/presentations/lib/presentationcontroller.py (+1/-1) |
To merge this branch: | bzr merge lp:~phill-ridout/openlp/path_fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Review via email: mp+369195@code.launchpad.net |
This proposal supersedes a proposal from 2019-06-21.
Commit message
Path fix ups
To post a comment you must log in.
Linux tests failed, please see https:/ /ci.openlp. io/job/ MP-02-Linux_ Tests/188/ for more details