diff options
| author | Minh Tran <mit@openerp.com> | 2012-08-31 15:32:13 +0200 |
|---|---|---|
| committer | Minh Tran <mit@openerp.com> | 2012-08-31 15:32:13 +0200 |
| commit | a93ae39aa8df51c132d799dfa1c7dd18ecbfcf3c (patch) | |
| tree | 4639304c6a09a2e6580a5bd27e5acc317fdb24df /addons/web/static/src | |
| parent | ffee21269b50023bc5cb2a62258942e08abbafe6 (diff) | |
| parent | a57ee611c4129f50797ef462e8dcb2b528f4669f (diff) | |
fix merge crap
bzr revid: mit@openerp.com-20120831133213-gn46ph3umef08u9r
Diffstat (limited to 'addons/web/static/src')
0 files changed, 0 insertions, 0 deletions