Merge branch 'roc_pe' of https://github.com/jocelyn/ROC into roc_pe

Conflicts:
	cms/cms-safe.ecf
This commit is contained in:
jvelilla
2014-10-14 17:22:40 -03:00
12 changed files with 133 additions and 12 deletions

View File

@@ -24,7 +24,7 @@
"backup_count":"4"
},
"server": {
"mode":"api"
"mode":"html"
}
}