Anand Doshi 0c26f8116d Merge branch '1310' of github.com:webnotes/erpnext ... Conflicts: accounts/doctype/account/account.py controllers/accounts_controller.py patches/patch_list.py selling/doctype/sales_common/sales_common.py stock/doctype/purchase_receipt/purchase_receipt.py		2013-11-15 19:12:09 +05:30
..
css	[fixes] [ui] [minor]	2013-11-14 15:35:57 +05:30
images	[fixes] [ui] [minor]	2013-11-14 15:59:46 +05:30
js	Merge branch '1310' of github.com:webnotes/erpnext	2013-11-15 19:12:09 +05:30
build.json	[website] [minor] moving to framework	2013-09-10 13:46:28 +05:30