tree ffb7c0decfb6340ace3c986ecf7c97cfd7e79d24
parent 00aaa4877945a9258638405e308c1943bdffe692
parent 56cbfe4bb0ee301f4922ae3b84ce0c85b3998768
author Saif Ur Rehman <saifi0102@gmail.com> 1549057744 +0500
committer Saif Ur Rehman <saifi0102@gmail.com> 1549057744 +0500

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

# Conflicts:
#	erpnext/stock/doctype/item/item.py