summaryrefslogtreecommitdiff
path: root/addons/web/static/src/xml/base.xml
diff options
context:
space:
mode:
authorGery Debongnie <ged@openerp.com>2014-04-08 11:08:52 +0200
committerGery Debongnie <ged@openerp.com>2014-04-08 11:08:52 +0200
commit53cca3a04652419fea1c7377acfe62eae1af8a88 (patch)
tree680a9ba3d9ce7c27916cdfd7548b1b4c43ae9dd1 /addons/web/static/src/xml/base.xml
parent4d797222279e361bfe6db0fe45f3ff503b87c717 (diff)
parentf1d3f2a0c42f1de5970b5f897c4e5b279d1ee23b (diff)
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20140407080642-b51z9j9cryb72tpc bzr revid: ged@openerp.com-20140408090852-xmfi9nwd2lzsfbza
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
-rw-r--r--addons/web/static/src/xml/base.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 23cad2098dc..3f7494c75fa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1264,7 +1264,6 @@
<td>
<t t-call="HiddenInputFile">
<t t-set="fileupload_id" t-value="widget.fileupload_id"/>
- <t t-set="fileupload_style" t-translation="off">width: 83px;</t>
<button class="oe_button oe_field_button" type="button">
<img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
<span>Select</span>