projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91a0ad9 bc69e18)
Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Mon, 6 Oct 2014 21:42:46 +0000 (23:42 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Mon, 6 Oct 2014 21:42:46 +0000 (23:42 +0200)
1  2 
addons/stock/product_view.xml patch | diff1 | diff2 | blob | history
addons/stock/stock_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/stock/product_view.xml
Simple merge
diff --cc addons/stock/stock_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.