summaryrefslogtreecommitdiff
path: root/addons/web/doc/module/static/src/css/web_example.css.1.diff
diff options
context:
space:
mode:
authorCedric Snauwaert <csn@openerp.com>2012-10-18 09:56:08 +0200
committerCedric Snauwaert <csn@openerp.com>2012-10-18 09:56:08 +0200
commit265f5fd13ac99d863a222ddc44cc8f9058ec1b99 (patch)
tree4c98620e7baa273bd3a05aaa0e36d28f187a2fd0 /addons/web/doc/module/static/src/css/web_example.css.1.diff
parent740142cbb69910ff057ea73e941509c766f9030b (diff)
[Conflict resolved after pull]
bzr revid: csn@openerp.com-20121018075608-9huwnmd0kev5193n
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions