diff options
| author | Khushboo Bhatt (Open ERP) <kbh@tinyerp.com> | 2012-06-29 14:37:31 +0530 |
|---|---|---|
| committer | Khushboo Bhatt (Open ERP) <kbh@tinyerp.com> | 2012-06-29 14:37:31 +0530 |
| commit | 06676feb499ba53c3ed6075a58b66a8d584f0451 (patch) | |
| tree | dc62bc7e5c2f4f23a9a665f2656c1700ef4b83ad /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 48000ffc050b89eae01fa0b938c97114f0450b98 (diff) | |
| parent | 2f0d821e6f52277ff5f400555b0d1533b23327d7 (diff) | |
[MERGE]merge with project branch and remove conflicts.
bzr revid: kbh@tinyerp.com-20120629090731-ex7nxbepw8tzydjo
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions