jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'dev/ui-ajustes'

Browse Source 
# Conflicts:
#   ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php
#   ci4/app/Language/es/Tarifaacabado.php
#   ci4/app/Language/es/Tarifamanipulado.php
#   ci4/app/Language/es/Tarifapreimpresion.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php
This commit is contained in:
Ignacio Martinez Navajas
2023-07-13 20:00:25 +00:00
parent 975a440e9c 4af11ec3e2
commit d8400dd195
25 changed files with 1164 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/.env
View File

@ -22,8 +22,8 @@ CI_ENVIRONMENT = development
# APP
#--------------------------------------------------------------------
#app.baseURL = 'https://sk-jjo.imnavajas.es'
app.baseURL = 'https://sk-imn.imnavajas.es'
app.baseURL = 'https://sk-jjo.imnavajas.es'
#app.baseURL = 'https://sk-imn.imnavajas.es'
# app.baseURL = "http://safekat.test/"
# app.forceGlobalSecureRequests = false