Merge lp:~unifield-team/unifield-web/web_uf_852 into lp:unifield-web
Proposed by
jftempo
Status: | Merged |
---|---|
Merge reported by: | jftempo |
Merged at revision: | not available |
Proposed branch: | lp:~unifield-team/unifield-web/web_uf_852 |
Merge into: | lp:unifield-web |
Diff against target: |
121 lines (+62/-2) (has conflicts) 3 files modified
addons/openerp/controllers/impex.py (+26/-2) addons/openerp/controllers/templates/exp.mako (+19/-0) addons/openerp/static/javascript/listgrid.js (+17/-0) Text conflict in addons/openerp/controllers/impex.py Text conflict in addons/openerp/controllers/templates/exp.mako Text conflict in addons/openerp/static/javascript/listgrid.js |
To merge this branch: | bzr merge lp:~unifield-team/unifield-web/web_uf_852 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Dev Team | Pending | ||
Review via email: mp+96730@code.launchpad.net |
To post a comment you must log in.