tree 0981dd296c4f367b64d9604c7d4605841cfbfe5a
parent 091cfba5fca12389ca74532fdef321337f2b03a8
parent bf0b6fd8a99566cc64b0384e92a56469f083eb3b
author Saif Ur Rehman <saifi0102@gmail.com> 1547015153 +0500
committer Saif Ur Rehman <saifi0102@gmail.com> 1547015153 +0500

Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template

# Conflicts:
#	erpnext/patches.txt