Anand Doshi 22c9497833 Merge branch 'edge' of github.com:webnotes/erpnext into edge ...

Conflicts:
	patches/patch_list.py

2013-01-02 14:02:36 +05:30

..

doctype

new permission manager

2013-01-01 19:52:36 +05:30

page

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

2013-01-02 14:02:36 +05:30

__init__.py

moved directory structure

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