Skip to content

Commit

Permalink
Merge branch 'compose-1.7'
Browse files Browse the repository at this point in the history
# Conflicts:
#	compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/animations/AnimatedNavHostEngine.kt
#	compose-destinations-bottom-sheet/src/main/java/com/ramcosta/composedestinations/bottomsheet/spec/DestinationStyleBottomSheet.kt
#	compose-destinations-bottom-sheet/src/main/java/com/ramcosta/composedestinations/bottomsheet/utils/NavGraphBuilderDestinationExtensions.kt
#	compose-destinations-codegen/src/main/java/com/ramcosta/composedestinations/codegen/writers/CustomNavTypesWriter.kt
#	compose-destinations/src/main/java/com/ramcosta/composedestinations/DefaultNavHostEngine.kt
#	compose-destinations/src/main/java/com/ramcosta/composedestinations/animations/defaults/DefaultAnimationParams.kt
#	compose-destinations/src/main/java/com/ramcosta/composedestinations/animations/defaults/DestinationTransitions.kt
#	compose-destinations/src/main/java/com/ramcosta/composedestinations/spec/DestinationStyle.kt
#	playground/app/src/main/java/com/ramcosta/samples/playground/AppNavigation.kt
#	playground/app/src/main/java/com/ramcosta/samples/playground/commons/composables/PlaygroundScaffold.kt
#	sample/src/main/java/com/ramcosta/destinations/sample/SampleApp.kt
#	sample/src/main/java/com/ramcosta/destinations/sample/ui/composables/SampleScaffold.kt
  • Loading branch information
raamcosta committed Mar 12, 2024
2 parents 88d549c + 2048950 commit bde87ac
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit bde87ac

Please sign in to comment.