Iain Powrie 67ed35a6b0 Merge branch 'JonathanAlKass-master-patch-25467' into 'dev' ...

removed ".decoder" from orjson in crafty-4/app/classes/web/routes/api/roles/index.py: line 113

See merge request crafty-controller/crafty-4!674

2023-11-25 20:20:38 +00:00

..

controllers

Merge branch 'dev' into critical/security

2023-11-25 19:29:46 +00:00

minecraft

Set some stats logging to debug

2023-10-04 12:45:23 -04:00

models

Resolve Conflicts from Merge branch 'dev' into feature/openmetrics-implementation

2023-10-07 23:55:58 +02:00

shared

Schedule json dump to logfile every 5 minutes

2023-11-05 14:17:50 -05:00

web

Merge branch 'JonathanAlKass-master-patch-25467' into 'dev'

2023-11-25 20:20:38 +00:00