solved conflict composer.lock, config/app.php, workflow/engine/classes/SpoolRun.php

2019-07-11 11:03:09 -04:00
parent 1df3032abf d4c81fe47f
commit b634eb35d8
93 changed files with 7346 additions and 2617 deletions
--- a/workflow/engine/classes/WsBase.php
+++ b/workflow/engine/classes/WsBase.php
@@ -991,7 +991,7 @@ class WsBase
                $subject,
                G::buildFrom($setup, $from),
                $to,
-                G::replaceDataGridField(file_get_contents($fileTemplate), $fieldsCase, false, true),
+                G::replaceDataGridField(file_get_contents($fileTemplate), $fieldsCase, false),
                $cc,
                $bcc,
                '',