projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 439b65c df84594)
Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Tue, 4 Nov 2014 08:29:17 +0000 (09:29 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Tue, 4 Nov 2014 08:29:17 +0000 (09:29 +0100)
Conflicts:
addons/stock/stock.py

1  2 
addons/stock/stock.py patch | diff1 | diff2 | blob | history
addons/web/static/src/js/view_form.js patch | diff1 | diff2 | blob | history

diff --cc addons/stock/stock.py
Simple merge
diff --cc addons/web/static/src/js/view_form.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.