summaryrefslogtreecommitdiff
path: root/addons/web/doc/module/static/src/css/web_example.css.1.diff
diff options
context:
space:
mode:
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-10-23 11:29:17 +0530
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-10-23 11:29:17 +0530
commit574d66b65e0743bbe3aabdb5358be5fa2baa042e (patch)
treea7b2a6c96a33219544c2f4feb9179874fc20eedf /addons/web/doc/module/static/src/css/web_example.css.1.diff
parent6239433a002dc17d72e2e9c9d0eae61507825027 (diff)
parenta8e18cdcfca27e0fbe776c71a049e63ce491386f (diff)
[MERGE]merge wimerge with trunk
bzr revid: sgo@tinyerp.com-20121023055917-uno61gb5thzrib2g
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions