git.inspyration.org Git - odoo/odoo.git/commit - addons/website/static/src/css/website.sass

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7b3e28d 655a5b9)

author	Denis Ledoux <dle@odoo.com>
	Mon, 4 Aug 2014 14:56:10 +0000 (16:56 +0200)
committer	Denis Ledoux <dle@odoo.com>
	Mon, 4 Aug 2014 14:56:10 +0000 (16:56 +0200)
commit	1bb219907f483f8720fc23a6f589a9d56a3703b4
tree	c654a5dc869b2af81d1661eda366508015423bd3	tree \| snapshot
parent	7b3e28dc741a36055d65a2980ceaa3204266db4a	commit \| diff
parent	655a5b948dff9c9c0985a65b17e30c410866fd02	commit \| diff

[MERGE] forward port of branch saas-5 up to 655a5b9

15 files changed:

addons/payment/models/payment_acquirer.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/sale/views/report_saleorder.xml	diff1 \|	diff2 \|	blob \| history
addons/website/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/css/website.css	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/css/website.sass	diff1 \|	diff2 \|	blob \| history
addons/website/static/src/js/website.seo.js	diff1 \|	diff2 \|	blob \| history
addons/website_quote/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/website_quote/models/order.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/website_sale/static/src/js/website_sale.js	diff1 \|	diff2 \|	blob \| history
addons/website_sale/views/templates.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.