Anand Doshi 3f321e759d Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate ...

Conflicts:
	version.num

2012-02-24 17:57:34 +05:30

..

all-app.js

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

2012-02-24 17:57:34 +05:30

all-web.js

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

2012-02-24 17:57:34 +05:30

app.js

added license files

2012-02-23 12:35:32 +05:30