tree fbaf686b228ec5b59b8b047751f4e98b1f01ad28
parent ec4dfab884361babc19409d7c26a9e48e62c3181
parent ca63548ae08b3eaa08e411167ab8945547342bb5
author Anand Doshi <anand@erpnext.com> 1369743410 +0530
committer Anand Doshi <anand@erpnext.com> 1369743410 +0530

Merge branch 'webshop' of github.com:webnotes/erpnext into responsive

Conflicts:
	selling/doctype/quotation/quotation.js