Merge lp://qastaging/~raoul-snyman/openlp/db-upgrades-2.4 into lp://qastaging/openlp/2.4

Proposed by Raoul Snyman
Status: Merged
Merged at revision: 2676
Proposed branch: lp://qastaging/~raoul-snyman/openlp/db-upgrades-2.4
Merge into: lp://qastaging/openlp/2.4
Diff against target: 251 lines (+120/-20)
4 files modified
CHANGELOG.rst (+8/-0)
openlp/plugins/songs/lib/importers/openlp.py (+31/-2)
openlp/plugins/songs/lib/upgrade.py (+32/-16)
tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py (+49/-2)
To merge this branch: bzr merge lp://qastaging/~raoul-snyman/openlp/db-upgrades-2.4
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+319385@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
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.

Subscribers

People subscribed via source and target branches

to all changes: