diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-23 11:42:19 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-23 11:42:19 +0100 |
| commit | ca5be8bf0b9bdb0e36f17727ece8ebbab4881bea (patch) | |
| tree | ca8e13844275c7df53f4ef76d65e93d655659d74 /addons/web/static | |
| parent | 274086825bb3218c62e0d8d4a84927f54e189284 (diff) | |
| parent | 980e27e09905cbcf9a7e7c9f957dab63e5d39dca (diff) | |
[MERGE] lp:909124. Conflict between account_bank_statement_extension and point_of_sale
bzr revid: qdp-launchpad@openerp.com-20120223104219-whw2z497ghxydks0
Diffstat (limited to 'addons/web/static')
0 files changed, 0 insertions, 0 deletions