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

author	Christophe Simonis <chs@openerp.com>
	Thu, 24 Apr 2014 13:14:05 +0000 (15:14 +0200)
committer	Christophe Simonis <chs@openerp.com>
	Thu, 24 Apr 2014 13:14:05 +0000 (15:14 +0200)
commit	c16780df832c13ad4f23c2b6821bb08f5349e94d
tree	6150cb73ecabbcf1df4d8d092b4b56dd6591a0d6	tree \| snapshot
parent	cd016e385c24d9fc3a2cc4348bcf11fc8f5da1c7	commit \| diff
parent	e59aecca94a0bdc7e893dcb593feef5baedcaa4b	commit \| diff

[MERGE] forward port of branch saas-3 up to revid 5120 chs@openerp.com-20140424125338-26k5atvtqwmmfv4e

bzr revid: chs@openerp.com-20140424131405-4oannh1102x42m8b

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

RSS Atom

openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/convert.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history