Merge lp:~unifield-team/unifield-server/us-988 into lp:unifield-server
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 4156 |
Proposed branch: | lp:~unifield-team/unifield-server/us-988 |
Merge into: | lp:unifield-server |
Diff against target: |
123 lines (+48/-6) (has conflicts) 2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+35/-1) bin/addons/sale_override/sale.py (+13/-5) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
To merge this branch: | bzr merge lp:~unifield-team/unifield-server/us-988 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+314822@code.launchpad.net |
To post a comment you must log in.