projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f487fbb a69f789)
[MERGE] forward port of branch saas-2 up to revid 5007 chs@openerp.com-20140206110220...
authorChristophe Simonis <chs@openerp.com>
Thu, 6 Feb 2014 11:04:23 +0000 (12:04 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 6 Feb 2014 11:04:23 +0000 (12:04 +0100)
bzr revid: chs@openerp.com-20140206110423-qe4h5ip2dg6dm7ph

1  2 
openerp/addons/base/ir/ir_fields.py patch | diff1 | diff2 | blob | history
openerp/osv/orm.py patch | diff1 | diff2 | blob | history

diff --cc openerp/addons/base/ir/ir_fields.py
Simple merge
diff --cc openerp/osv/orm.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.