Merge branch 'main' into 'develop'

# Conflicts:
#   default.conf
#   docker-compose.yml
#   frontend/Dockerfile
#   frontend/README.md
#   frontend/app/app.css
#   frontend/app/root.tsx
#   frontend/app/routes.ts
#   frontend/package.json
#   frontend/vite.config.ts

frontend/app/routes/home.tsx

@@ -0,0 +1,13 @@
+import type { Route } from "./+types/home";
+import { Welcome } from "../welcome/welcome";
+
+export function meta({}: Route.MetaArgs) {
+  return [
+    { title: "New React Router App" },
+    { name: "description", content: "Welcome to React Router!" },
+  ];
+}
+
+export default function Home() {
+  return <Welcome />;
+}