diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-15 13:07:59 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-15 13:07:59 +0100 |
| commit | 5d59401b9143908f90921925606795fa9ff8af51 (patch) | |
| tree | e786c804453f3e0900b903335d1e5abfe524792e /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 8ba623dd8e80a5229e17acd299c0c4772203727c (diff) | |
| parent | 914a97f329485074c428830c5bfc0f93ac867f52 (diff) | |
[MERGE] Sync with trunk, tried to resolve the conflicts without breakign everything.
bzr revid: tde@openerp.com-20130315120759-sf1o1sd80ycuuy7n
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions