Skip to content
Snippets Groups Projects
  • Charlotte Hausman's avatar
    02e0cd3c
    Merge remote-tracking branch 'origin/2.8.2-DEVELOPMENT' into conflict_check · 02e0cd3c
    Charlotte Hausman authored
    # Conflicts:
    #	apps/cli/executables/pexable/productfetcher/setup.py
    #	apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html
    #	apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts
    #	ci/bin/generate-yaml.py
    #	shared/workspaces/alembic/versions/762c98a8adf1_pims_split_quicklook_corrections.py
    #	shared/workspaces/workspaces/workflow/services/workflow_service.py
    02e0cd3c
    History
    Merge remote-tracking branch 'origin/2.8.2-DEVELOPMENT' into conflict_check
    Charlotte Hausman authored
    # Conflicts:
    #	apps/cli/executables/pexable/productfetcher/setup.py
    #	apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.html
    #	apps/web/src/app/workspaces/components/active-capability-requests/active-capability-requests.component.ts
    #	ci/bin/generate-yaml.py
    #	shared/workspaces/alembic/versions/762c98a8adf1_pims_split_quicklook_corrections.py
    #	shared/workspaces/workspaces/workflow/services/workflow_service.py