git.inspyration.org Git - odoo/odoo.git/commit - addons/website_forum/views/website_forum.xml

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c92e1b6 6e8ba28)

author	Fabien Meghazi <fme@openerp.com>
	Tue, 29 Apr 2014 15:41:04 +0000 (17:41 +0200)
committer	Fabien Meghazi <fme@openerp.com>
	Tue, 29 Apr 2014 15:41:04 +0000 (17:41 +0200)
commit	b7003a382acf679387164648c601c74149bc2617
tree	856c1a1f5cb0ae47d2ade45a7fd550ca2d019c30	tree \| snapshot
parent	c92e1b6bcbedb0059a458ce8dc2d5f1a5bbfb8b6	commit \| diff
parent	6e8ba284a57a7b0e0951ed324fa87c61289e28b8	commit \| diff

[MERGE] upstream

bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea

17 files changed:

addons/account/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/base_import/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/crm/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/event/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/hr/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/hr_attendance/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/hr_recruitment/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_sheet/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/project/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/sale_crm/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/stock/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/website/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	diff1 \|	diff2 \|	blob \| history
addons/website_forum/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/website_forum/views/website_forum.xml	diff1 \|	diff2 \|	blob \| history
addons/website_report/views/layouts.xml	diff1 \|	diff2 \|	blob \| history

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