Merge lp:~unifield-team/unifield-server/us-1273 into lp:unifield-server
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 3752 |
Proposed branch: | lp:~unifield-team/unifield-server/us-1273 |
Merge into: | lp:unifield-server |
Diff against target: |
48 lines (+19/-0) (has conflicts) 2 files modified
bin/addons/msf_profile/data/patches.xml (+7/-0) bin/addons/msf_profile/msf_profile.py (+12/-0) Text conflict in bin/addons/msf_profile/data/patches.xml Text conflict in bin/addons/msf_profile/msf_profile.py |
To merge this branch: | bzr merge lp:~unifield-team/unifield-server/us-1273 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+295152@code.launchpad.net |
To post a comment you must log in.