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

author	Pooja Zankhariya (OpenERP) <pza@tinyerp.com>
	Wed, 15 Jan 2014 12:30:52 +0000 (17:30 +0500)
committer	Pooja Zankhariya (OpenERP) <pza@tinyerp.com>
	Wed, 15 Jan 2014 12:30:52 +0000 (17:30 +0500)
commit	ba458f6abc1edb810a3f37fe5f21c5c29cf52c87
tree	fa36005a1ecee36836604f8398d6bf34f2342204	tree \| snapshot
parent	c722fff1f87547c8703740885d7a8d7500217755	commit \| diff
parent	21906d9d27144e849644759b4233f99f06db59ef	commit \| diff

[MERGE]Merge with Parent

bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d

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

addons/email_template/wizard/mail_compose_message.py	diff1 \|	diff2 \|	blob \| history
addons/sale/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/sale/res_config_view.xml	diff1 \|	diff2 \|	blob \| history
addons/website/views/snippets.xml	diff1 \|	diff2 \|	blob \| history
addons/website_sale/security/website_sale.xml	diff1 \|	diff2 \|	blob \| history