Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source 
Conflicts:
	website/doctype/website_settings/website_settings.txt
This commit is contained in:
Anand Doshi 2013-04-17 15:50:20 +05:30
commit 311a243bdc
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
website/doctype/website_settings/website_settings.txt
View File

@ -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"
},
@ -227,13 +227,6 @@
"label": "Domain List",
"reqd": 0
},
{
"create": 1,
"doctype": "DocPerm",
"permlevel": 0,
"role": "System Manager",
"write": 1
},
{
"create": 1,
"doctype": "DocPerm",