Fixup merge

This commit is contained in:
Dane Everitt 2017-04-20 17:26:20 -04:00
parent 8d24e5f168
commit c8f1335a09
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
12 changed files with 13 additions and 589 deletions

View file

@ -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([