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

2012-08-31 16:57:04 +05:30 · 2012-08-31 16:57:04 +05:30 · eb3089e6e3
commit eb3089e6e3
parent b4ea4adeec c53a0ffe34
1 changed files with 2 additions and 2 deletions
--- a/erpnext/support/doctype/communication/communication.txt
+++ b/erpnext/support/doctype/communication/communication.txt
@ -5,7 +5,7 @@
 	{
 		'creation': '2012-06-26 11:58:13',
 		'docstatus': 0,
-		'modified': '2012-08-31 13:14:16',
+		'modified': '2012-08-31 16:44:13',
 		'modified_by': u'Administrator',
 		'owner': u'Administrator'
 	},
@ -188,7 +188,7 @@
 	{
 		'doctype': u'DocField',
 		'fieldname': u'content',
-		'fieldtype': u'Text Editor',
+		'fieldtype': u'Text',
 		'label': u'Content',
 		'permlevel': 0,
 		'reqd': 0