diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-07-29 10:42:50 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-07-29 10:42:50 +0200 |
| commit | 6b1a804b29a4d9c84bf9bbbc3a4c6a02b09e24ab (patch) | |
| tree | a67fa51ab256ed842f058836e79ff36eb4999c3b /addons/website/static/src/js | |
| parent | 10fce02eb0ee8c9eb9fa19c9ab0af8ef19b3ab2e (diff) | |
| parent | b91a75f7eff85edd5d51a91d10d6e3be8a409030 (diff) | |
[MERGE] forward port of branch 7.0 up to b91a75f7eff85edd5d51a91d10d6e3be8a409030
Conflicts:
addons/base_vat/base_vat.py
openerp/tools/safe_eval.py
Diffstat (limited to 'addons/website/static/src/js')
0 files changed, 0 insertions, 0 deletions