Merge lp:~jfb-tempo-consulting/unifield-server/us-5912 into lp:unifield-server
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 5436 |
Proposed branch: | lp:~jfb-tempo-consulting/unifield-server/us-5912 |
Merge into: | lp:unifield-server |
Diff against target: |
96 lines (+50/-3) (has conflicts) 3 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+14/-0) bin/addons/msf_supply_doc_export/wizard/po_follow_up.py (+18/-2) bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py (+18/-1) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
To merge this branch: | bzr merge lp:~jfb-tempo-consulting/unifield-server/us-5912 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+370755@code.launchpad.net |
To post a comment you must log in.