starred/sky_phone
1
0
Fork 0
mirror of https://github.com/sky-systems/sky_phone.git synced 2026-08-29 01:08:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
352f1b61937185e988c12befffdd92e7ea1f596d
sky_phone/frontend/testserver
T
History
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
..
index.cjs
Merge branch 'dev' into feature/funk
2026-08-07 16:06:51 +02:00