seitime-frappe/frappe/core
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
page Merge remote-tracking branch 'frappe/develop' into v5.0 2015-02-24 18:06:16 +05:30
report 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
notifications.py [welcome] redis, refactored cache and notification count 2014-12-26 12:50:45 +05:30
README.md rename Profile to User frappe/frappe#470 2014-03-11 16:14:47 +05:30

Core module contains the models required for the basic functioning of frappe including DocType, User (user), Role and others.