projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89041fa 668b8c2)
Merge remote-tracking branch 'odoo/master' into master-wmsstaging4-jco
authorJosse Colpaert <jco@odoo.com>
Thu, 26 Jun 2014 09:28:11 +0000 (11:28 +0200)
committerJosse Colpaert <jco@odoo.com>
Thu, 26 Jun 2014 09:28:11 +0000 (11:28 +0200)
1  2 
addons/mrp/mrp.py patch | diff1 | diff2 | blob | history

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