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

author	Christophe Simonis <chs@odoo.com>
	Sun, 22 Jun 2014 11:44:30 +0000 (13:44 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Sun, 22 Jun 2014 11:44:30 +0000 (13:44 +0200)
commit	75884c3e1a06f9f6c2ffd4ab272287369f9a325c
tree	2edb175f8c8c83190e641f3e043c48bd5c2b4c19	tree \| snapshot
parent	631e309554eaa43dccfe54c3eab928783e507117	commit \| diff
parent	7e85786b8389993fa5bd3a0be68343ad0dbaa187	commit \| diff

[MERGE] forward port of branch 7.0 up to 7e85786

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

addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_list_editable.js	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/module.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/module_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/wizard/base_module_upgrade.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_config.py	diff1 \|	diff2 \|	blob \| history