Merge lp://qastaging/~phill-ridout/openlp/ftw-update into lp://qastaging/openlp/ftw-data
Proposed by
Phill
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 21 | ||||||||
Proposed branch: | lp://qastaging/~phill-ridout/openlp/ftw-update | ||||||||
Merge into: | lp://qastaging/openlp/ftw-data | ||||||||
Diff against target: |
454 lines (+46/-46) 2 files modified
download_3.0.json (+45/-45) scripts/jsongen.py (+1/-1) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~phill-ridout/openlp/ftw-update | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Review via email:
|
Commit message
Update all resources to the latest versions. Put them in folders identifying their version number, so as to avoid overwriting data that previous versions of OpenLP use.
To post a comment you must log in.
Looks fine to me.