projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b958b7 368936d)
Merge branch 'upstream/saas-5' into saas-5 saas-5
authorAlicia FLOREZ <alic.florez@gmail.com>
Fri, 27 Jun 2014 14:57:38 +0000 (16:57 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Fri, 27 Jun 2014 14:57:38 +0000 (16:57 +0200)
Conflicts:
addons/website_sale/static/src/js/website.tour.sale.js

1  2 
addons/gamification/models/challenge.py patch | diff1 | diff2 | blob | history
addons/product/product.py patch | diff1 | diff2 | blob | history
addons/website_mail_group/views/website_mail_group.xml patch | diff1 | diff2 | blob | history
addons/website_sale/static/src/js/website.tour.sale.js patch | diff1 | diff2 | blob | history

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