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