projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54b901e 7d7f6fe)
[MERGE] forward port of branch saas-5 up to 7d7f6fe
authorDenis Ledoux <dle@odoo.com>
Tue, 5 Aug 2014 14:04:58 +0000 (16:04 +0200)
committerDenis Ledoux <dle@odoo.com>
Tue, 5 Aug 2014 14:04:58 +0000 (16:04 +0200)
1  2 
addons/mrp/mrp.py patch | diff1 | diff2 | blob | history
addons/purchase/purchase_view.xml patch | diff1 | diff2 | blob | history

diff --cc addons/mrp/mrp.py
Simple merge
diff --cc addons/purchase/purchase_view.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.