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
..
autodoc	[docs] fixes and updates	2015-02-13 16:10:47 +05:30
emails	[merge] conflicts	2014-10-21 12:34:57 +05:30
form_grid	[email] wip	2015-01-21 12:51:35 +05:30
generators	Website Listing	2015-02-23 22:30:03 +05:30
includes	Merge remote-tracking branch 'frappe/develop' into v5.0	2015-02-24 18:06:16 +05:30
pages	Merge remote-tracking branch 'frappe/develop' into v5.0	2015-02-24 18:06:16 +05:30
print_formats	[print] tables & [feature] share #992	2015-02-04 17:01:46 +05:30
styles	Fixed Conflict while merging v4 to v5	2015-02-10 17:20:39 +05:30
__init__.py	-webnotes +frappe 💥	2014-02-14 14:55:11 +05:30
base.html	Website Listing	2015-02-23 22:30:03 +05:30