Merge branch 'master' into edge
Conflicts:
website/doctype/website_settings/website_settings.txt
diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt
index 4b66e09..615c0a5 100644
--- a/website/doctype/website_settings/website_settings.txt
+++ b/website/doctype/website_settings/website_settings.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-03-25 16:01:34",
+ "creation": "2013-03-26 06:51:18",
"docstatus": 0,
- "modified": "2013-04-12 10:30:18",
+ "modified": "2013-04-17 11:51:30",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -231,13 +231,6 @@
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
- "role": "System Manager",
- "write": 1
- },
- {
- "create": 1,
- "doctype": "DocPerm",
- "permlevel": 0,
"role": "Website Manager",
"write": 1
},