Merge remote-tracking branch 'frappe/master' into develop

Browse Source

Conflicts:
	erpnext/patches.txt

...

This commit is contained in:

Anand Doshi 2015-09-24 14:34:50 +05:30

parent c020e42d20 5b649521d1

commit e63da9813c

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

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