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
..
_messages_js.json	Merge branch 'master' of github.com:webnotes/erpnext into edge	2013-02-21 11:09:43 +05:30
ar-js.json	updated translations	2013-02-18 14:24:05 +05:30
es-js.json	updated translations	2013-02-18 14:24:05 +05:30
fr-js.json	updated translations	2013-02-18 14:24:05 +05:30
hi-js.json	updated translations	2013-02-18 14:24:05 +05:30
hr-js.json	updated translations	2013-02-18 14:24:05 +05:30
nl-js.json	updated translations	2013-02-18 14:24:05 +05:30
pt-js.json	updated translations	2013-02-18 14:24:05 +05:30
sr-js.json	updated languages	2013-01-28 14:21:40 +05:30
ta-js.json	updated languages	2013-01-28 14:21:40 +05:30