Merge branch 'master' of github.com:webnotes/erpnext into edge

Browse Source

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

...

This commit is contained in:

Anand Doshi

2013-02-21 11:09:43 +05:30

parent 8867cc2381 1c36697556

commit 59d8a76e60

36 changed files with 1595 additions and 110 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1313

translations/th.csv Normal file

File diff suppressed because it is too large Load Diff