git.inspyration.org Git - odoo/odoo.git/commit - addons/web/static/src/js/views.js

author	Christophe Simonis <chs@odoo.com>
	Fri, 27 Jun 2014 14:08:09 +0000 (16:08 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Fri, 27 Jun 2014 14:08:09 +0000 (16:08 +0200)
commit	8dfd5eab0134d8995514b7965d3244d260cabfa4
tree	2ef0287b192d95edba8767e1b444b83126102857	tree \| snapshot
parent	368936df7c980e80ec46d034c5d682b078e155e5	commit \| diff
parent	a4bc65cdbaf8c26992317d34a99472a012a90735	commit \| diff

[MERGE] forward port of branch saas-4 up to a4bc65c

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

addons/l10n_fr_hr_payroll/report/fiche_paye.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/views.js	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history
addons/website/models/ir_http.py	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
openerp/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history