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

Conflicts: erpnext/patches/patch_list.py
2012-08-23 15:26:38 +05:30
parent 297f37da03 6db2ac51e6
commit d297b88f60
3 changed files with 10 additions and 2 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -552,5 +552,9 @@ patch_list = [
 	{
 		'patch_module': 'patches.august_2012',
 		'patch_file': 'change_profile_permission',
-	}
+	},
+	{
+		'patch_module': 'patches.august_2012',
+		'patch_file': 'changed_blog_date_format',
+	},
 ]