6e174cc2c4
Conflicts: erpnext/setup/doctype/notification_control/notification_control.js index.html version.num |
||
---|---|---|
.. | ||
dashboard | ||
event_updates | ||
my_company | ||
profile_settings | ||
__init__.py | ||
.DS_Store |
6e174cc2c4
Conflicts: erpnext/setup/doctype/notification_control/notification_control.js index.html version.num |
||
---|---|---|
.. | ||
dashboard | ||
event_updates | ||
my_company | ||
profile_settings | ||
__init__.py | ||
.DS_Store |