Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…
Browse files Browse the repository at this point in the history
…024-12-02
  • Loading branch information
leonardehrenfried committed Dec 2, 2024
2 parents b280d88 + e919778 commit e129338
Show file tree
Hide file tree
Showing 376 changed files with 16,955 additions and 12,133 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@

# Make OTP a multi-module project
ead33ffe280dd7caf72cae5ff7a41542e8427636

# json file reformatting with prettier
c287575df6798810a69fafc54c8c4e1867b71367
Loading

0 comments on commit e129338

Please sign in to comment.