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

author	Thibault Delavallée <tde@openerp.com>
	Thu, 16 Jan 2014 09:17:16 +0000 (10:17 +0100)
committer	Thibault Delavallée <tde@openerp.com>
	Thu, 16 Jan 2014 09:17:16 +0000 (10:17 +0100)
commit	ab5c23079ab6e0c3d773f6c5364333e851481cfb
tree	35642567a517c0638f9b954bae4f58ffe27f19d1	tree \| snapshot
parent	130fff6241300cfcaf7a233905b63e2894e1cae0	commit \| diff
parent	7b2948c3bcf9da7de528c6ef76e54d8821133450	commit \| diff

[MERGE] Sync with trunk, solved conflicts.

bzr revid: tde@openerp.com-20140116091716-zk1n5ots94i65io5

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

openerp/addons/base/base_demo.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner_demo.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/http.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/fields.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tests/test_mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history