Anand Doshi daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext ...

Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv

2013-11-04 13:14:39 +05:30

..

setup

Removed Update Manager

2013-10-24 20:47:35 +05:30

setup_wizard

Merge branch '1310' of github.com:webnotes/erpnext

2013-11-04 13:14:39 +05:30

__init__.py

moved directory structure

2012-09-24 19:13:42 +05:30