summaryrefslogtreecommitdiff
path: root/addons/web/doc/module/static/src/css/web_example.css.1.diff
diff options
context:
space:
mode:
authorTejas Tank <tta@openerp.com>2012-07-17 15:48:45 +0530
committerTejas Tank <tta@openerp.com>2012-07-17 15:48:45 +0530
commit45c50d3a31cc9627e61384bd0c1c80f22c5e740e (patch)
tree98a72dfe089805dd23e59997b62fca546c4c2255 /addons/web/doc/module/static/src/css/web_example.css.1.diff
parent51b1ae8bfc710388638ca4b81c6b834fbc105bcd (diff)
parent6dac47419fa0b65f6be078e74e2664fcb95a2bc4 (diff)
merged lasted + resolve conflicts + etherpad with project.task
bzr revid: tta@openerp.com-20120717101845-52upauotn1sjfqio
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions