projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba7aee8 6e80e42)
[MERGE] Rebase incorrect top-level merge of `pad/wiki` refactoring + extra merge...
authorOlivier Dony <odo@openerp.com>
Wed, 29 Aug 2012 15:54:00 +0000 (17:54 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 29 Aug 2012 15:54:00 +0000 (17:54 +0200)
commitbc74fc920cd159ebcbcee62d0b3e99eaac15641e
treec4c1d4633be52a442420d27251035321eb5ab801tree | snapshot
parentba7aee832d999b940c1139218d6966db660510fecommit | diff
parent6e80e425d1626d46c0f48054a5beb339fa1cd557commit | diff
[MERGE] Rebase incorrect top-level merge of `pad/wiki` refactoring + extra merge of product form simplification

To be completed by an extra merge containing the remaining
work-in-progress stuff of pad/wiki refactoring.

bzr revid: odo@openerp.com-20120829155400-memirrjghutw5pl7
Unnamed repository; edit this file 'description' to name the repository.