Nabin Hait 096d363087 [fix] fixed merge conflict		2013-10-18 12:50:28 +05:30
..
accounts.js	[minor] removed get_rate	2013-10-10 17:07:53 +05:30
stock_controller.js	[fix] fixed merge conflict	2013-10-18 12:50:28 +05:30