tree 6faa77c4afe41deb76034a247a83770cd1ad3c21
parent fa65c7bf29deba0c091b0488f640f325e90569c1
parent 491df14426d6f671d427ba31b545f9bd5418c504
author Rushabh Mehta <rmehta@gmail.com> 1440653499 +0530
committer Rushabh Mehta <rmehta@gmail.com> 1440653499 +0530

Merge branch 'layout-cleanup' into develop

Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
	erpnext/stock/doctype/delivery_note/delivery_note.json