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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9640e83 fee0d01)

author	Fabien Pinckaers <fp@tinyerp.com>
	Sat, 12 Apr 2014 13:01:32 +0000 (15:01 +0200)
committer	Fabien Pinckaers <fp@tinyerp.com>
	Sat, 12 Apr 2014 13:01:32 +0000 (15:01 +0200)
commit	915ac89024a884399d145129c9eb3c6c6156da6c
tree	ecba9ae35d6aca1384fec86dfcf9a1045a788837	tree \| snapshot
parent	9640e839d876504373da479a02ef62c536d95d8f	commit \| diff
parent	fee0d0100d20366e75ad67f7cf9e6628247bdfc1	commit \| diff

[merge]

bzr revid: fp@tinyerp.com-20140412130132-6dncdvhrxsciyr7l

addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mass_mailing/models/email_template.py	\|	diff2 \|	blob \| history
addons/mass_mailing/models/mass_mailing.py	\|	diff2 \|	blob \| history
addons/mass_mailing/views/mass_mailing.xml	\|	diff2 \|	blob \| history

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