tree 8b7111b06c401d069e7ccff867315862dfb30e30
parent 1ea98cbbe1f1d93adac518c5c4c354615fd2f8b0
parent 7a2163ca3953286d22e7bf50e6f3c44d700cb79b
author Saif Ur Rehman <saifi0102@gmail.com> 1549022746 +0500
committer Saif Ur Rehman <saifi0102@gmail.com> 1549022746 +0500

Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults

# Conflicts:
#	erpnext/setup/doctype/brand/brand.json
#	erpnext/stock/get_item_details.py