projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6389181
acbdac4
)
[MERGE] Forward-port saas-5 up to acbdac4
author
Olivier Dony
<odo@openerp.com>
Thu, 14 Aug 2014 12:56:41 +0000
(14:56 +0200)
committer
Olivier Dony
<odo@openerp.com>
Thu, 14 Aug 2014 12:56:57 +0000
(14:56 +0200)
1
2
addons/sale_stock/sale_stock_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/web/controllers/main.py
patch
|
diff1
|
diff2
|
blob
|
history
openerp/tools/translate.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/sale_stock/sale_stock_view.xml
Simple merge
diff --cc
addons/web/controllers/main.py
Simple merge
diff --cc
openerp/tools/translate.py
Simple merge