diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-06-21 17:26:13 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-06-21 17:26:13 +0200 |
| commit | e6ad094ffb51af86bccf0158fc3bc03db157ab40 (patch) | |
| tree | adc2c3fd1136246b63695a58ca468caad69c045b /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 97e94941cbdc02ffc6d3e45a441afa592070d900 (diff) | |
| parent | 87f754ca0a900b49ea43426465fe136c0762a185 (diff) | |
[MERGE] Merged with mail-state-tde, better than the last merge.
bzr revid: tde@openerp.com-20120621152143-wrc0tj0nepwk2pj1
bzr revid: tde@openerp.com-20120621152613-h6jecsggf1c1dbqy
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions