Fixup merge
This commit is contained in:
parent
8d24e5f168
commit
c8f1335a09
12 changed files with 13 additions and 589 deletions
|
@ -42,7 +42,7 @@ class OptionController extends Controller
|
|||
return response()->json([
|
||||
'scripts' => [
|
||||
'install' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_install),
|
||||
'upgrade' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_upgrade),
|
||||
// 'upgrade' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_upgrade),
|
||||
'privileged' => $server->option->script_is_privileged,
|
||||
],
|
||||
'env' => $environment->merge([
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue