Conflicts: hr/doctype/leave_application/locale/_messages_py.json hr/doctype/leave_block_list/locale/_messages_doc.json public/js/locale/_messages_js.json setup/doctype/email_digest/locale/_messages_doc.json setup/doctype/global_defaults/global_defaults.txt |
||
---|---|---|
.. | ||
locale | ||
__init__.py | ||
item.js | ||
item.py | ||
item.txt | ||
test_item.py |