diff options
| author | Minh Tran <mit@openerp.com> | 2012-08-31 15:31:33 +0200 |
|---|---|---|
| committer | Minh Tran <mit@openerp.com> | 2012-08-31 15:31:33 +0200 |
| commit | a57ee611c4129f50797ef462e8dcb2b528f4669f (patch) | |
| tree | 001100101922d9ab0532e7635fc3e8dfeb135a01 /addons/web/static/src/xml/base.xml | |
| parent | c0d5a806824986284dd022e0478e57fc1e59feb7 (diff) | |
fix merge crap
bzr revid: mit@openerp.com-20120831133133-5u2jvawyn6xkth91
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
0 files changed, 0 insertions, 0 deletions