Commit Graph
5 Commits
Author SHA1 Message Date
DerEchteAlec 352f1b6193 Merge branch 'dev' into feature/funk
# Conflicts:
#	frontend/src/config/apps.test.ts
#	frontend/src/config/apps.ts
#	frontend/src/stores/phone.ts
#	frontend/testserver/index.cjs
#	sky_phone/config/locales/en.lua
#	sky_phone/source/html/index.html
#	sky_phone/source/server/db_migrate.lua
2026-08-07 16:06:51 +02:00
DerEchteAlec fc859888c3 ADD - integrate configurable radio app 2026-08-06 19:46:34 +02:00
Eichenholz 48bcc6c551 ENH - update weather branch from dev 2026-08-06 19:42:55 +02:00
smx.pusha 50df7d11c4 ENH - refine phone apps and FiveM integration 2026-08-06 18:49:30 +02:00
DerEchteAlec b9ca1f1153 ENH - add standalone framework and inventory bridges 2026-08-05 20:14:47 +02:00