[FIX] website controller, correctly resolve last merge about images
authorAntony Lesuisse <al@openerp.com>
Thu, 1 May 2014 16:50:04 +0000 (18:50 +0200)
committerAntony Lesuisse <al@openerp.com>
Thu, 1 May 2014 16:50:04 +0000 (18:50 +0200)
commit2998bec0e0684fae3e5755e4c86354d8576dba53
treee2f40700885ccc744593bb3199e361e502ffcc77
parentb5209451cd837488bee2918a89de8aa6da65004c
[FIX] website controller, correctly resolve last merge about images
fix fp commit to use debian compatible werkzeug api data instead of set_data

bzr revid: al@openerp.com-20140501165004-0e6xp8e9hdpifofj
addons/website/controllers/main.py