diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-11-15 00:37:43 +0100 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-11-15 00:37:43 +0100 |
| commit | 7629191431252f6feb777898a2626b7073775e21 (patch) | |
| tree | 09a08b39844e93c2fdb3e882e719eb6ab9976f7d /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | ba22c50e12c05f1d9969b9fff0edeb552db76eac (diff) | |
[MERGE] manual merge parts of chs owp
bzr revid: al@openerp.com-20121114233743-u9499fa3eugw94zi
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions