Merge remote-tracking branch 'upstream/dev-2.x' into remove-rental-fu…

…zzy-mapping
opentripplanner · Dec 3, 2024 · 7d29c1d · 7d29c1d
2 parents 8f2c146 + c7fe2f2
commit 7d29c1d
Show file tree

Hide file tree

Showing 283 changed files with 8,284 additions and 8,880 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -12,3 +12,6 @@
 
 # Make OTP a multi-module project
 ead33ffe280dd7caf72cae5ff7a41542e8427636
+
+# json file reformatting with prettier
+c287575df6798810a69fafc54c8c4e1867b71367