Merge remote-tracking branch 'origin/master' into merging-from-master

ChronosSF · ChronosSF · commit 23253dda542c · 2024-06-19T15:52:17.000+03:00
diff --git a/browser/public/meta.json b/browser/public/meta.json
@@ -1 +1 @@
-{"version":"23.2.915","date":"2024-06-18 23:10:52","note":"this file is auto-generated"}
+{"version":"23.2.915","date":"2024-06-18 23:10:52","note":"this file is auto-generated"}
diff --git a/browser/src/navigation/SamplesBrowser.json b/browser/src/navigation/SamplesBrowser.json
@@ -1 +1 @@
-{"version":"23.2.915","date":"2024-06-18 23:10:52","note":"this file is auto-generated"}
+{"version":"23.2.915","date":"2024-06-18 23:10:52","note":"this file is auto-generated"}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"version":"23.2.915","date":"2024-06-18 23:10:52","note":"this file is auto-generated"}`
	`1`	`+{"version":"23.2.915","date":"2024-06-18 23:10:52","note":"this file is auto-generated"}`