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

Browse Source

Conflicts:
	patches/january_2013/holiday_list_patch.py

...

This commit is contained in:

Anand Doshi

2013-01-08 19:38:23 +05:30

parent 6f88c6680e a2945e8e4b

commit f8e248d051

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

Diff Content Not Available