Skip to content

Commit

Permalink
Merge branch 'master' into jonas-jonas/nativeRecovery
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas-jonas authored Oct 19, 2023
2 parents fd45796 + afed81d commit 1f9d42f
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,9 @@ https://github.com/ory/kratos/pull/3480

Part of https://github.com/ory/network/issues/320

- Add max-age to default cors headers
([#3584](https://github.com/ory/kratos/issues/3584))
([c5b4aaa](https://github.com/ory/kratos/commit/c5b4aaa2df5d010b62a99ccf45850583daad3a66))
- Add missing tracing & attributes in oidc strategy
([#3429](https://github.com/ory/kratos/issues/3429))
([09bcb71](https://github.com/ory/kratos/commit/09bcb71f1f0b3238e2d0f4376a1a2290d062c6c1))
Expand Down

0 comments on commit 1f9d42f

Please sign in to comment.