Merge branch 'master' of github.com:webnotes/erpnext into website-wip

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-09-12 17:03:21 +05:30
6 changed files with 17 additions and 7 deletions

View File

@@ -263,5 +263,6 @@ patch_list = [
"patches.september_2013.p01_update_communication",
"execute:webnotes.reload_doc('setup', 'doctype', 'features_setup') # 2013-09-05",
"patches.september_2013.p02_fix_serial_no_status",
"patches.september_2013.p03_move_website_to_framework"
"patches.september_2013.p03_update_stock_uom_in_sle",
"patches.september_2013.p03_move_website_to_framework",
]