git.inspyration.org Git - odoo/odoo.git/commit

author	Christophe Simonis <chs@openerp.com>
	Thu, 24 Apr 2014 12:53:38 +0000 (14:53 +0200)
committer	Christophe Simonis <chs@openerp.com>
	Thu, 24 Apr 2014 12:53:38 +0000 (14:53 +0200)
commit	e59aecca94a0bdc7e893dcb593feef5baedcaa4b
tree	ae280b66c38c6492be75dfcc13a792bdcaeac244	tree \| snapshot
parent	52cfc16c2e2f33395a53b255825a8153ec80ce40	commit \| diff
parent	91bf583b1c52f15f11c299ca5c914126d2e8d01b	commit \| diff

[MERGE] forward port of branch 7.0 up to revid 5288 mat@openerp.com-20140423150215-578nzug1glccvpwy

bzr revid: chs@openerp.com-20140424125338-26k5atvtqwmmfv4e

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

RSS Atom

openerp/addons/base/res/res_partner_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/test/base_test.yml	diff1 \|	diff2 \|	blob \| history
openerp/tools/convert.py	diff1 \|	diff2 \|	blob \| history