Anand Doshi 6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco ...

Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt

2013-01-14 13:28:31 +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 stock_reco

2013-01-14 13:28:31 +05:30

build.json

stock uom replace bugfix

2013-01-11 10:50:54 +05:30