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

Conflicts:
	erpnext/patches/patch_list.py
This commit is contained in:
Anand Doshi
2012-07-17 13:21:55 +05:30
3 changed files with 11 additions and 1 deletions

View File

@@ -500,4 +500,9 @@ patch_list = [
'patch_file': 'auth_table',
'description': 'create new __Auth table'
},
{
'patch_module': 'patches.july_2012',
'patch_file': 'remove_event_role_owner_match',
'description': "Remove Owner match from Event DocType's Permissions"
},
]