Skip to content

Commit

Permalink
Merge branch 'main' into feat/import-proposal
Browse files Browse the repository at this point in the history
# Conflicts:
#	catalyst_voices/apps/voices/lib/pages/workspace/header/import_proposal_button.dart
#	catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/proposal_builder/proposal_builder_bloc.dart
#	catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/proposal_builder/proposal_builder_state.dart
#	catalyst_voices/packages/internal/catalyst_voices_repositories/lib/src/document/document_repository.dart
#	catalyst_voices/packages/internal/catalyst_voices_services/lib/src/proposal/proposal_service.dart
  • Loading branch information
dtscalac committed Feb 28, 2025
2 parents 2e96e13 + 66aa3c8 commit 336a5d4
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 336a5d4

Please sign in to comment.