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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 103cea2 56bb1b9)

author	Christophe Matthieu <chm@openerp.com>
	Mon, 2 Dec 2013 15:08:56 +0000 (16:08 +0100)
committer	Christophe Matthieu <chm@openerp.com>
	Mon, 2 Dec 2013 15:08:56 +0000 (16:08 +0100)
commit	846012220976bdf93761b83e2ae393e8723b2dce
tree	43518de30f1d7edc173febdee56bbb4c001c8d60	tree \| snapshot
parent	103cea2da0016ff780db5e127fb31ab14771551b	commit \| diff
parent	56bb1b9869b278456b1598bafba049a2fd49cde8	commit \| diff

[MERGE] sync with trunk

bzr revid: chm@openerp.com-20131202150856-fzrfcoa8pmsjutau

16 files changed:

openerp/addons/base/base.sql	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_fields.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_http.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_translation.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/tests/test_views.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_acl.py	diff1 \|	diff2 \|	blob \| history
openerp/tests/test_mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history
openerpcommand/common.py	diff1 \|	diff2 \|	blob \| history

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