Conflicts: frappe/__version__.py frappe/core/doctype/communication/communication.json frappe/hooks.py frappe/model/document.py frappe/public/css/form.css frappe/public/less/form.less requirements.txt setup.py |
||
|---|---|---|
| .. | ||
| current | ||
| v5 | ||
| __init__.py | ||
Conflicts: frappe/__version__.py frappe/core/doctype/communication/communication.json frappe/hooks.py frappe/model/document.py frappe/public/css/form.css frappe/public/less/form.less requirements.txt setup.py |
||
|---|---|---|
| .. | ||
| current | ||
| v5 | ||
| __init__.py | ||