summaryrefslogtreecommitdiff
path: root/addons/web/doc/module/static/src/css/web_example.css.1.diff
diff options
context:
space:
mode:
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>2012-07-20 16:55:17 +0530
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>2012-07-20 16:55:17 +0530
commit0f221d5c2af5600269e8cff3ed221d6472fbe95a (patch)
treec153dadbc0326ff65663518b7b71ea3040105800 /addons/web/doc/module/static/src/css/web_example.css.1.diff
parentacb90399441608280a7e5b51e6b1bf5e1e41a7ab (diff)
parent476b8cf4da784bb1c9713034caa8da09bd11b7d8 (diff)
[IMP] merge with parent branch
bzr revid: fka@tinyerp.com-20120720070334-yr5212uozyfhre2b bzr revid: apa@tinyerp.com-20120720095344-crjqqnuzblreungv bzr revid: fka@tinyerp.com-20120720112517-stj0j8mao1y9cgwh
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions