diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2011-12-01 15:22:50 +0100 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2011-12-01 15:22:50 +0100 |
| commit | 22c0a0f8cc1dd7fbd4716527930cef07505709a7 (patch) | |
| tree | 329357491d5062558e2a460f245d8259b20b94bd /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 43745c4cb9653f40f72a261da655caa4dabe40e7 (diff) | |
| parent | 9212a7f81a4cc1fe74e81cdd4d58523119460a03 (diff) | |
[MERGE] loading: changes to add --all to the -i option.
This merges only part of the merged branch, which inlcuded two different things.
bzr revid: vmt@openerp.com-20111201142250-rmptyomi7px826y0
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions