Merge lp:~julie-w/unifield-server/US-4759 into lp:unifield-server
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 5044 |
Proposed branch: | lp:~julie-w/unifield-server/US-4759 |
Merge into: | lp:unifield-server |
Diff against target: |
111 lines (+40/-5) (has conflicts) 2 files modified
bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py (+31/-5) bin/addons/msf_profile/i18n/fr_MF.po (+9/-0) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
To merge this branch: | bzr merge lp:~julie-w/unifield-server/US-4759 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+352739@code.launchpad.net |
To post a comment you must log in.