Iain Powrie 3dc1d90cf4 Merge branch 'dev' into 'feature/steamcmd' ... # Conflicts: # Dockerfile # app/classes/models/servers.py # app/classes/shared/helpers.py # app/classes/shared/main_controller.py # app/classes/shared/server.py # main.py		2024-08-06 21:00:22 +00:00
..
classes	Merge branch 'dev' into 'feature/steamcmd'	2024-08-06 21:00:22 +00:00
config	Prepare 4.4.2 release base	2024-08-06 21:31:41 +01:00
frontend	Merge branch 'dev' into 'feature/steamcmd'	2024-08-06 21:00:22 +00:00
migrations	Merge branch 'dev' into 'feature/steamcmd'	2024-08-06 21:00:22 +00:00
translations	Merge branch 'lang/new-lang-russian' of gitlab.com:crafty-controller/crafty-4 into lang/new-lang-russian	2024-08-06 20:10:06 +01:00