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

Browse Source

Conflicts:
	erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py

...

This commit is contained in:

Anand Doshi 2012-08-06 13:36:19 +05:30

parent e64d900322 337fef0859

commit 1c2b192be6

1 changed files with 79 additions and 79 deletions

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

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