diff options
| author | Amit Patel <apa@tinyerp.com> | 2012-10-29 17:56:33 +0530 |
|---|---|---|
| committer | Amit Patel <apa@tinyerp.com> | 2012-10-29 17:56:33 +0530 |
| commit | 1739898cdd73646549fee04ac4aca5356b1a0776 (patch) | |
| tree | 2918c729388a252f9d30906cb14ad5a648c82b17 /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 9dfcc1d6dcd6257c502f498d984f317491e36f30 (diff) | |
resolevd conflicts
bzr revid: apa@tinyerp.com-20121029122633-cvjz2bor72winb5h
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions