Merge lp://staging/~jfb-tempo-consulting/unifield-web/US-7088 into lp://staging/unifield-web
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 4996 |
| Proposed branch: | lp://staging/~jfb-tempo-consulting/unifield-web/US-7088 |
| Merge into: | lp://staging/unifield-web |
| Diff against target: |
319 lines (+190/-8) 7 files modified
addons/openerp/controllers/root.py (+24/-7) addons/openerp/controllers/templates/index.mako (+82/-1) addons/openerp/po/messages/fr.po (+20/-0) addons/openerp/static/css/menu.css (+49/-0) addons/openerp/widgets/listgrid.py (+11/-0) addons/openerp/widgets/templates/listgrid/url.mako (+3/-0) openobject/static/css/jquery.fancybox-1.3.1.css (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~jfb-tempo-consulting/unifield-web/US-7088 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Dev 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
