git.inspyration.org Git - odoo/odoo.git/commit - openerp/addons/base/res/res

author	Christophe Simonis <chs@openerp.com>
	Wed, 12 Mar 2014 18:06:14 +0000 (19:06 +0100)
committer	Christophe Simonis <chs@openerp.com>
	Wed, 12 Mar 2014 18:06:14 +0000 (19:06 +0100)
commit	c7d114d9a9cdb6005ceb7b523412cf1a91870025
tree	a7dd452873a6ea3fe4d5d8769f5666e8cde142af	tree \| snapshot
parent	e13ac3153f5c3b3c4687b2b9ed5e45528112762f	commit \| diff
parent	1c3ee251f0213b2fb83de99be8a50e630447e191	commit \| diff

[MERGE] forward port of branch saas-2 up to revid 5020 chs@openerp.com-20140312174526-a5rhh83g0fw8djuc

bzr revid: chs@openerp.com-20140312180614-8yb454s3mkjwnk2q

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/safe_eval.py	diff1 \|	diff2 \|	blob \| history