Merge lp://staging/~mukunde/unifield-server/US-10725 into lp://staging/unifield-server
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 6385 |
Proposed branch: | lp://staging/~mukunde/unifield-server/US-10725 |
Merge into: | lp://staging/unifield-server |
Diff against target: |
194 lines (+40/-7) (has conflicts) 3 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+14/-1) bin/addons/register_accounting/wizard/wizard_cash_return.py (+23/-5) bin/addons/register_accounting/wizard/wizard_cash_return.xml (+3/-1) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
To merge this branch: | bzr merge lp://staging/~mukunde/unifield-server/US-10725 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+434937@code.staging.launchpad.net |
To post a comment you must log in.