tree 48d0c021ab77a5c8c7f1e911c553c751c77ef8b4
parent cd2d8a0410f73f5548db42915012a33d11491fc7
parent 3c107cdbf8f2a3493254d0c72bdee91df42a59e2
author Anand Doshi <anand@erpnext.com> 1440655760 +0530
committer Anand Doshi <anand@erpnext.com> 1440655760 +0530

Merge branch 'validation-settings' of https://github.com/rmehta/erpnext into rmehta-validation-settings

Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py