seitime-frappe/frappe/email
Anand Doshi f6cdd4a655 Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.py
	frappe/core/page/desktop/desktop.js
	frappe/hooks.py
	frappe/translations/ar.csv
	frappe/translations/es.csv
	frappe/translations/fr.csv
	frappe/translations/hr.csv
	frappe/translations/id.csv
	frappe/translations/ja.csv
	frappe/translations/nl.csv
	frappe/translations/pl.csv
	frappe/translations/pt-BR.csv
	frappe/translations/ru.csv
	frappe/translations/tr.csv
	frappe/translations/zh-cn.csv
	frappe/translations/zh-tw.csv
	frappe/utils/email_lib/html2text.py
	setup.py
2015-02-24 18:06:16 +05:30
..
doctype Merge remote-tracking branch 'frappe/develop' into v5.0 2015-02-24 18:06:16 +05:30
__init__.py [minor] added reply-to in frappe.sendmail and cleanup 2015-01-23 15:20:08 +05:30
bulk.py [tests] 2015-02-21 22:37:35 +05:30
email_body.py Fixed Conflict while merging v4 to v5 2015-02-10 17:20:39 +05:30
receive.py [tests] 2015-02-21 22:37:35 +05:30
smtp.py [tests] 2015-02-21 22:37:35 +05:30