projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8c424c 1f78dfb)
[MERGE]with lp:openobject-server
authorJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Mon, 10 Feb 2014 06:35:47 +0000 (12:05 +0530)
committerJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Mon, 10 Feb 2014 06:35:47 +0000 (12:05 +0530)
bzr revid: jpr@tinyerp.com-20140210063547-3g8nsj4qtly2hfap

1  2 
openerp/addons/base/ir/ir_actions.py patch | diff1 | diff2 | blob | history

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