OpenLP

Merge lp://qastaging/~raoul-snyman/openlp/fix-author-type-2.4 into lp://qastaging/openlp/2.4

  1. fix-author-type-2.4
  2. Merge into 2.4
Proposed by Raoul Snyman
Status: Merged
Merged at revision: 2680
Proposed branch: lp://qastaging/~raoul-snyman/openlp/fix-author-type-2.4
Merge into: lp://qastaging/openlp/2.4
Diff against target: 172 lines (+85/-11)
6 files modified
openlp/core/ui/slidecontroller.py (+3/-1)
openlp/plugins/songs/lib/importers/openlp.py (+6/-6)
tests/functional/openlp_core/test_init.py (+72/-0)
tests/functional/openlp_core_ui/test_slidecontroller.py (+1/-1)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+2/-2)
tests/resources/opensongsongs/Amazing Grace.json (+1/-1)
To merge this branch: bzr merge lp://qastaging/~raoul-snyman/openlp/fix-author-type-2.4
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Tomas Groth Approve
Review via email: mp+321137@code.qastaging.launchpad.net

Commit message

Fix the author_type import properly

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote :

I'm gonna trust you on this one...

review: Approve
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: