Skip to content

Commit

Permalink
Merge branch 'main' into feature/change-presentation-configuration
Browse files Browse the repository at this point in the history
# Conflicts:
#	inspektify/src/commonMain/kotlin/sp/bvantur/inspektify/ktor/InspektifyKtorConfig.kt
#	inspektify/src/commonMain/kotlin/sp/bvantur/inspektify/ktor/client/data/InspektifyKtorClient.kt
#	konsistTest/src/jvmTest/kotlin/inspektify/LibKonsistTest.kt
  • Loading branch information
BVantur committed Dec 6, 2024
2 parents cbaed88 + 4328378 commit 76d696c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# These are supported funding model platforms

github: [BVantur]
buy_me_a_coffee: bvantur
2 changes: 2 additions & 0 deletions konsistTest/src/jvmTest/kotlin/inspektify/LibKonsistTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ class LibKonsistTest {
"InspektifyKtorConfig:dataRetentionPolicy",
"InspektifyKtorConfig:shortcutEnabled",
"InspektifyKtorConfig:redactHeaders",
"IgnorePathData:method",
"IgnorePathData:matchingStrategy",
"InspektifyKtorConfig:redactBodyProperties",
"InspektifyKtorConfig:ignoreEndpoints",
"InspektifyKtorConfig:autoDetectEnabledFor"
Expand Down

0 comments on commit 76d696c

Please sign in to comment.