projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3f901ae
b4d3701
)
Merge remote-tracking branch 'odoo/7.0' into 7.0
author
OCA git bot
<OCA-git-bot@therp.nl>
Wed, 22 Oct 2014 21:42:36 +0000
(23:42 +0200)
committer
OCA git bot
<OCA-git-bot@therp.nl>
Wed, 22 Oct 2014 21:42:36 +0000
(23:42 +0200)
1
2
openerp/osv/orm.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
openerp/osv/orm.py
Simple merge