summaryrefslogtreecommitdiff
path: root/addons/web/doc/module/static/src/css/web_example.css.1.diff
diff options
context:
space:
mode:
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-07-18 12:15:07 +0200
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-07-18 12:15:07 +0200
commit0f74f43fdf3372adc582f559a9dc787402371f12 (patch)
tree5f6c39a139a9419933c771bdb553662705deb9c1 /addons/web/doc/module/static/src/css/web_example.css.1.diff
parente4c1ca04a11db2da818cbec650b241f6febbc674 (diff)
[FIX] account: bad merge had duplicated some fields\!
bzr revid: qdp-launchpad@openerp.com-20120718101507-lj66v0k3lm2tt5av
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions