projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb978c6 be7c894)
Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Wed, 5 Nov 2014 09:37:15 +0000 (10:37 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Wed, 5 Nov 2014 09:37:15 +0000 (10:37 +0100)
Conflicts:
addons/account/account_invoice.py

1  2 
addons/account/account_invoice.py patch | diff1 | diff2 | blob | history
addons/web/static/src/js/views.js patch | diff1 | diff2 | blob | history
addons/web_kanban/static/src/js/kanban.js patch | diff1 | diff2 | blob | history

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