Merge branch 'roc_pe' of https://github.com/jocelyn/ROC into roc_pe
Conflicts: cms/cms-safe.ecf
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
"backup_count":"4"
|
||||
},
|
||||
"server": {
|
||||
"mode":"api"
|
||||
"mode":"html"
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user