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

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-04-29 15:23:30 +05:30
3 changed files with 15 additions and 8 deletions

View File

@@ -248,4 +248,5 @@ patch_list = [
"patches.april_2013.p06_default_cost_center",
"execute:webnotes.reset_perms('File Data')",
"patches.april_2013.p07_update_file_data_2",
"patches.april_2013.rebuild_sales_browser",
]