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 |
||
|---|---|---|
| .. | ||
| data_import_tool | ||
| desktop | ||
| modules_setup | ||
| permission_manager | ||
| user_permissions | ||
| __init__.py | ||