Merge branch 'dev' into 5540-validarSupplierIsVies

2023-05-02 06:07:17 +00:00 · 2023-05-02 06:07:17 +00:00 · d9aae670f7
parent 06c01f3e94 ddec9fe406
commit d9aae670f7
2 changed files with 1 additions and 1 deletions
--- a/1
+++ b/1
@ -52,6 +52,7 @@ pipeline {
            }}}
            environment {
                NODE_ENV = ""
+                TZ = 'Europe/Madrid'
            }
            parallel {
                stage('Frontend') {
--- a/front/salix/components/log/index.html
+++ b/front/salix/components/log/index.html
@ -112,7 +112,6 @@
        </div>
    </div>
 </vn-data-viewer>
-<vn-pagination model="model"></vn-pagination>
 <vn-side-menu side="right">
    <form vn-vertical
        ng-model-options="{updateOn: 'change blur'}"