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	[refactor] moved workflow to separate module	2014-09-29 12:21:11 +05:30