Merge branch 'master' of github.com:anandpdoshi/erpnext

Browse Source

Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py

...

This commit is contained in:

Anand Doshi

2011-12-14 20:05:16 +05:30

parent ddf4c2655d 3fe9795020

commit e7982f0f85

1 changed files with 1 additions and 1 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