Merge lp://qastaging/~phill-ridout/openlp/bible_media_item_refactors into lp://qastaging/openlp
Proposed by
Phill
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 2723 | ||||
Proposed branch: | lp://qastaging/~phill-ridout/openlp/bible_media_item_refactors | ||||
Merge into: | lp://qastaging/openlp | ||||
Diff against target: |
76585 lines (+38172/-38124) 1 file modified
openlp/core/resources.py (+38172/-38124) |
||||
To merge this branch: | bzr merge lp://qastaging/~phill-ridout/openlp/bible_media_item_refactors | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Raoul Snyman | Approve | ||
Review via email:
|
Description of the change
Merge in regenerated resources
To post a comment you must log in.
Oops, sorry for the double approve, my page hadn't refreshed properly.