Merge branch 'main' into release-next

remix-run · Mar 27, 2024 · b267a1c · b267a1c
2 parents f2d6ff5 + 00ffa36
commit b267a1c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/contributors.yml b/contributors.yml
@@ -3,6 +3,7 @@
 - abeadam
 - abhi-kr-2100
 - AchThomas
+- acusti
 - adamdotjs
 - adil62
 - adriananin

diff --git a/docs/hooks/use-navigate.md b/docs/hooks/use-navigate.md
@@ -109,7 +109,7 @@ new URL("..", window.origin + location.pathname);
 
 // With trailing slashes:
 new URL(".", window.origin + location.pathname + "/");
-// 'https://remix.run/docs/en/main/start/future-flags/'
+// 'https://remix.run/docs/en/main/start/quickstart/'
 new URL("..", window.origin + location.pathname + "/");
 // 'https://remix.run/docs/en/main/start/'
 ```

diff --git a/docs/start/changelog.md b/docs/start/changelog.md
@@ -0,0 +1,9 @@
+---
+title: Changelog
+---
+
+# Changelog
+
+See the detailed changelog for each release on [GitHub][changelog].
+
+[changelog]: https://github.com/remix-run/react-router/blob/main/CHANGELOG.md