Akhilesh Darjee 86894f3bbf merge conflict fixed		2014-01-27 15:42:02 +05:30
..
doctype	merge conflict fixed	2014-01-27 15:42:02 +05:30
page	Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip	2014-01-24 21:44:36 +05:30
__init__.py	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
install.py	Added Applications page and fixed issues in translations and hooks	2013-12-23 16:09:00 +05:30
utils.py	Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip	2014-01-24 21:44:36 +05:30