Conflicts: webnotes/__init__.py webnotes/core/doctype/docfield/docfield.txt webnotes/core/page/data_import_tool/data_import_tool.js webnotes/defaults.py webnotes/install_lib/install.py webnotes/model/bean.py webnotes/model/code.py webnotes/sessions.py webnotes/tests/test_nested_set.py webnotes/widgets/page.py |
||
|---|---|---|
| .. | ||
| applications | ||
| data_import_tool | ||
| desktop | ||
| finder | ||
| messages | ||
| modules_setup | ||
| permission_manager | ||
| todo | ||
| user_properties | ||
| __init__.py | ||