git.inspyration.org Git - odoo/odoo.git/commit

author	Antony Lesuisse <al@openerp.com>
	Thu, 1 May 2014 17:25:08 +0000 (19:25 +0200)
committer	Antony Lesuisse <al@openerp.com>
	Thu, 1 May 2014 17:25:08 +0000 (19:25 +0200)
commit	5e21a4235d1c1b5b8d10a1f4fef147f84812ce5f
tree	19c3ec192b18549dd37b20da8a5aca8bf859bab9	tree \| snapshot
parent	2998bec0e0684fae3e5755e4c86354d8576dba53	commit \| diff
parent	abbe08f76a87be47c78abafa7b0af0064df3a6a4	commit \| diff

[MERGE] saas-4 up to dle@openerp.com-20140501121915-q88k37nd25ietw8c

bzr revid: al@openerp.com-20140501172508-tjennzht30ktw3nz

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

addons/web/controllers/main.py	diff1 \|	diff2 \|	blob \| history
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/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history
addons/web_graph/static/src/js/graph_widget.js	diff1 \|	diff2 \|	blob \| history