diff options
| author | Olivier Dony <odo@openerp.com> | 2012-08-07 11:38:02 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-08-07 11:38:02 +0200 |
| commit | 063d5693a1cc20cbc56a2691c53ab5d3d6fdb223 (patch) | |
| tree | b314a6c77cf807809619b918a91fb8c05e456404 /addons/base_module_doc_rst/base_module_doc_rst_view.xml | |
| parent | c3d3d2683c879ce952555ff2648af041dc67325f (diff) | |
| parent | 3cfd65b43d53a37664752b949e6e98e19e57092e (diff) | |
[MERGE] mail.alias implementation + mrp.repair improvement + placeholders review + misc bits
Attempt to fix previous fp-style merge breaking weeks
of history. Unfortunately this one will swallow a few
extra merges on top of the mail.alias merge, as well
as a few odd commits
bzr revid: odo@openerp.com-20120807093802-f20mfq8a42rp84wp
Diffstat (limited to 'addons/base_module_doc_rst/base_module_doc_rst_view.xml')
0 files changed, 0 insertions, 0 deletions