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/vuexy'

Browse Source 
# Conflicts:
#   ci4/app/Controllers/Home.php
#   ci4/app/Controllers/Test.php
This commit is contained in:
Ignacio Martinez Navajas
2023-05-10 10:56:57 +00:00
parent 95d79d1dc5 fc0d7e0298
commit aa87d0325f
51 changed files with 2172 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Controllers/Settings.php
View File

@ -10,7 +10,7 @@ use App\Models\TemplateModel;
use App\Models\ThemeModel;
use App\Models\TimezoneModel;
use App\Models\UserGroupModel;
use App\Models\UserModel;
use App\Models\Usuarios\UserModel;
class Settings extends BaseController
{