Anand Doshi 59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge ... Conflicts: hr/doctype/leave_application/locale/_messages_py.json hr/doctype/leave_block_list/locale/_messages_doc.json public/js/locale/_messages_js.json setup/doctype/email_digest/locale/_messages_doc.json setup/doctype/global_defaults/global_defaults.txt		2013-02-21 11:09:43 +05:30
..
doctype	Merge branch 'master' of github.com:webnotes/erpnext into edge	2013-02-21 11:09:43 +05:30
DocType Mapper	changed old type txt to new type txtt	2012-12-11 15:20:53 +05:30
module_def/hr/locale	updated language	2013-02-11 11:49:18 +05:30
page	website settings social icons	2013-02-20 15:02:21 +05:30
search_criteria	fixes in salary register report	2013-02-01 18:13:54 +05:30
__init__.py	install from txt files, part 1	2013-01-16 17:48:17 +05:30