projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b07b14 c6a5be0)
Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Thu, 6 Nov 2014 22:42:38 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Thu, 6 Nov 2014 22:42:38 +0000 (23:42 +0100)
1  2 
addons/account_asset/account_asset.py patch | diff1 | diff2 | blob | history
addons/web/static/src/js/view_form.js patch | diff1 | diff2 | blob | history

diff --cc addons/account_asset/account_asset.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.