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
..
images	desktop icons now use font-awesome	2012-12-21 15:00:29 +05:30
js	Merge branch 'master' of github.com:webnotes/erpnext into edge	2013-02-21 11:09:43 +05:30
build.json	stock uom replace bugfix	2013-01-11 10:50:54 +05:30