Unifield Web

Merge lp:~unifield-team/unifield-web/web_UF_1839 into lp:unifield-web

  1. web_UF_1839
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4708
Proposed branch: lp:~unifield-team/unifield-web/web_UF_1839
Merge into: lp:unifield-web
Diff against target: 11 lines (+1/-0)
1 file modified
addons/openerp/controllers/actions.py (+1/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/web_UF_1839
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+156595@code.launchpad.net
To post a comment you must log in.
lp:~unifield-team/unifield-web/web_UF_1839 updated
4702. By Matthieu Dietrich <mdietrich@chloups211>

UF-1839: [MERGE] merged with latest trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/openerp/controllers/actions.py'
--- addons/openerp/controllers/actions.py 2013-01-25 15:29:01 +0000
+++ addons/openerp/controllers/actions.py 2013-04-16 14:42:28 +0000
@@ -120,6 +120,7 @@
120 'csv' : 'text/csv',120 'csv' : 'text/csv',
121 'rtf' : 'application/rtf',121 'rtf' : 'application/rtf',
122 'txt' : 'text/plain',122 'txt' : 'text/plain',
123 'zip' : 'application/zip',
123}124}
124125
125def _print_data(data):126def _print_data(data):

Subscribers

People subscribed via source and target branches

to all changes: