Anand Doshi ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list ... Conflicts: accounts/doctype/gl_control/gl_control.py		2013-01-17 20:31:41 +05:30
..
images	desktop icons now use font-awesome	2012-12-21 15:00:29 +05:30
js	Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list	2013-01-17 20:31:41 +05:30
build.json	stock uom replace bugfix	2013-01-11 10:50:54 +05:30