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
..
static/assets	Remove unused and problematic "dropdown-menu" ident from css	2024-07-29 16:41:25 -04:00
templates	Merge branch 'dev' into 'feature/steamcmd'	2024-08-06 21:00:22 +00:00