Merge pull request #16098 from ethereum/master

corwintines · web-flow · commit b7e77781b0da · 2025-08-20T12:55:25.000-06:00
Master -&gt; staging
diff --git a/public/_redirects b/public/_redirects
@@ -160,6 +160,9 @@
 
 /*/use /:splat/apps/ 301!
 
+# Exception: don't redirect developers/docs/dapps paths
+/*/developers/docs/dapps* /:splat/developers/docs/dapps:splat 200!
+
 /*/dapps /:splat/apps/ 301!
 
 /*/contributing/translation-program/translation-guide/ /:splat/contributing/translation-program/faq/ 301!
diff --git a/src/components/Translatathon/TranslatathonCalendar.tsx b/src/components/Translatathon/TranslatathonCalendar.tsx
@@ -35,7 +35,7 @@ const events = [
       "https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=NWU3ZzE3czNyazViYXVqcjNqZnQ5dHYxMmMgY185ZTRiMWIyNzYwNzQzNDYzODE2MTAwYTE2OWQxNDI0MzAzNTJhN2NmYzMzNDRiMWU3ODVkYjUyMzg1YzlmZDM2QGc&tmsrc=c_9e4b1b2760743463816100a169d142430352a7cfc3344b1e785db52385c9fd36%40group.calendar.google.com",
   },
   {
-    date: "2024-08-25T12:00:00Z",
+    date: "2025-08-25T12:00:00Z",
     title: "Translatathon kickoff call",
     calendarLink:
       "https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=MzBzYzQ0ODU5YnZkNHNiY251bDl0M2M2bnMgY185ZTRiMWIyNzYwNzQzNDYzODE2MTAwYTE2OWQxNDI0MzAzNTJhN2NmYzMzNDRiMWU3ODVkYjUyMzg1YzlmZDM2QGc&tmsrc=c_9e4b1b2760743463816100a169d142430352a7cfc3344b1e785db52385c9fd36%40group.calendar.google.com",

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ const events = [`
`35`	`35`	`"https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=NWU3ZzE3czNyazViYXVqcjNqZnQ5dHYxMmMgY185ZTRiMWIyNzYwNzQzNDYzODE2MTAwYTE2OWQxNDI0MzAzNTJhN2NmYzMzNDRiMWU3ODVkYjUyMzg1YzlmZDM2QGc&tmsrc=c_9e4b1b2760743463816100a169d142430352a7cfc3344b1e785db52385c9fd36%40group.calendar.google.com",`
`36`	`36`	`},`
`37`	`37`	`{`
`38`		`- date: "2024-08-25T12:00:00Z",`
	`38`	`+ date: "2025-08-25T12:00:00Z",`
`39`	`39`	`title: "Translatathon kickoff call",`
`40`	`40`	`calendarLink:`
`41`	`41`	`"https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=MzBzYzQ0ODU5YnZkNHNiY251bDl0M2M2bnMgY185ZTRiMWIyNzYwNzQzNDYzODE2MTAwYTE2OWQxNDI0MzAzNTJhN2NmYzMzNDRiMWU3ODVkYjUyMzg1YzlmZDM2QGc&tmsrc=c_9e4b1b2760743463816100a169d142430352a7cfc3344b1e785db52385c9fd36%40group.calendar.google.com",`