projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce83eb0 c28a5a1)
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com...
authorDenis Ledoux <dle@openerp.com>
Wed, 9 Apr 2014 16:31:32 +0000 (18:31 +0200)
committerDenis Ledoux <dle@openerp.com>
Wed, 9 Apr 2014 16:31:32 +0000 (18:31 +0200)
bzr revid: dle@openerp.com-20140409163132-n3apqh6nvfg2qof9

1  2 
addons/account_asset/account_asset.py patch | diff1 | diff2 | blob | history
addons/pad/static/src/js/pad.js patch | diff1 | diff2 | blob | history

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