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
..
ar.csv	updated translations	2013-02-18 14:24:05 +05:30
es.csv	updated translations	2013-02-18 14:24:05 +05:30
fr.csv	updated translations	2013-02-18 14:24:05 +05:30
hi.csv	updated translations	2013-02-18 14:24:05 +05:30
hr.csv	updated translations	2013-02-18 14:24:05 +05:30
nl.csv	updated translations	2013-02-18 14:24:05 +05:30
pt.csv	updated translations	2013-02-18 14:24:05 +05:30
si.csv	updated languages	2013-01-28 14:21:40 +05:30
sr.csv	updated languages	2013-01-28 14:21:40 +05:30
ta.csv	updated languages	2013-01-28 14:21:40 +05:30
th.csv	website settings social icons	2013-02-20 15:02:21 +05:30