Merge lp://staging/~dorian-kemps/unifield-server/US-7025-7039 into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 5647 |
| Proposed branch: | lp://staging/~dorian-kemps/unifield-server/US-7025-7039 |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
94 lines (+67/-0) (has conflicts) 2 files modified
bin/addons/msf_profile/data/patches.xml (+8/-0) bin/addons/msf_profile/msf_profile.py (+59/-0) Text conflict in bin/addons/msf_profile/data/patches.xml |
| To merge this branch: | bzr merge lp://staging/~dorian-kemps/unifield-server/US-7025-7039 |
| 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
