projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c9f247d
e862ff7
)
Merge remote-tracking branch 'odoo/master' into master-wmsstagingmig-jco
author
Josse Colpaert
<jco@odoo.com>
Mon, 23 Jun 2014 08:06:42 +0000
(10:06 +0200)
committer
Josse Colpaert
<jco@odoo.com>
Mon, 23 Jun 2014 08:06:42 +0000
(10:06 +0200)
1
2
addons/stock/stock.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/stock/stock.py
Simple merge