Merge lp://staging/~dorian-kemps/unifield-server/US-2725 into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~dorian-kemps/unifield-server/US-2725 |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
61 lines (+26/-1) (has conflicts) 3 files modified
bin/addons/msf_profile/data/patches.xml (+8/-0) bin/addons/msf_profile/msf_profile.py (+14/-0) bin/addons/product_attributes/product_attributes.py (+4/-1) Text conflict in bin/addons/msf_profile/data/patches.xml |
| To merge this branch: | bzr merge lp://staging/~dorian-kemps/unifield-server/US-2725 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Reviewer Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
