6e174cc2c4
Conflicts: erpnext/setup/doctype/notification_control/notification_control.js index.html version.num |
||
---|---|---|
.. | ||
__init__.py | ||
my_company.css | ||
my_company.html | ||
my_company.js | ||
my_company.py | ||
my_company.txt |
6e174cc2c4
Conflicts: erpnext/setup/doctype/notification_control/notification_control.js index.html version.num |
||
---|---|---|
.. | ||
__init__.py | ||
my_company.css | ||
my_company.html | ||
my_company.js | ||
my_company.py | ||
my_company.txt |