16ad50f641
Conflicts: erpnext/stock/doctype/item/item.txt |
||
---|---|---|
.. | ||
__init__.py | ||
desktop.css | ||
desktop.html | ||
desktop.js | ||
desktop.txt |
16ad50f641
Conflicts: erpnext/stock/doctype/item/item.txt |
||
---|---|---|
.. | ||
__init__.py | ||
desktop.css | ||
desktop.html | ||
desktop.js | ||
desktop.txt |